diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
index e3af4f416..0897b42eb 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
@@ -242,6 +242,7 @@ public final class SlimefunRegistry {
         return globalItemHandlers;
     }
 
+    @Deprecated
     public Map<String, SlimefunBlockHandler> getBlockHandlers() {
         return blockHandlers;
     }
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/UnregisterReason.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/UnregisterReason.java
index fd76a81c9..3361d2787 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/UnregisterReason.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/UnregisterReason.java
@@ -10,9 +10,12 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler;
  *
  * @author TheBusyBiscuit
  * 
+ * @deprecated This enum is no longer needed
+ * 
  * @see SlimefunBlockHandler
  * 
  */
+@Deprecated
 public enum UnregisterReason {
 
     /**
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/ItemHandler.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/ItemHandler.java
index 7333724c2..e2a33f7fe 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/ItemHandler.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/ItemHandler.java
@@ -2,6 +2,8 @@ package me.mrCookieSlime.Slimefun.Objects.handlers;
 
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+
 import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException;
 import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler;
 import io.github.thebusybiscuit.slimefun4.core.handlers.BowShootHandler;
@@ -51,7 +53,8 @@ public interface ItemHandler {
      * @return An {@link Optional} describing the result, it will contain an {@link IncompatibleItemHandlerException}
      *         should there be an issue
      */
-    default Optional<IncompatibleItemHandlerException> validate(SlimefunItem item) {
+    @Nonnull
+    default Optional<IncompatibleItemHandlerException> validate(@Nonnull SlimefunItem item) {
         return Optional.empty();
     }
 
@@ -61,5 +64,6 @@ public interface ItemHandler {
      * 
      * @return The {@link Class} identifier for this {@link ItemHandler}
      */
+    @Nonnull
     Class<? extends ItemHandler> getIdentifier();
 }