diff --git a/eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java b/eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java
index 7921a0da..6c91fc59 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java
@@ -6,6 +6,7 @@ import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Class for all plugin-specific client-side item display modules.
@@ -48,7 +49,7 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * @param args      Optional args for display.
      */
     protected void display(@NotNull final ItemStack itemStack,
-                           @NotNull final Player player,
+                           @Nullable final Player player,
                            @NotNull final Object... args) {
         // Technically optional.
     }
diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/slot/EcoSlot.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/slot/EcoSlot.java
index 2e723203..0688433c 100644
--- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/slot/EcoSlot.java
+++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/slot/EcoSlot.java
@@ -12,6 +12,8 @@ import java.util.function.BiConsumer;
 import java.util.function.Function;
 
 public class EcoSlot implements Slot {
+    private static final BiConsumer<InventoryClickEvent, Slot> NOOP = ((event, slot) -> { });
+
     @Getter
     private final Function<Player, ItemStack> provider;
 
@@ -32,16 +34,11 @@ public class EcoSlot implements Slot {
                    @Nullable final BiConsumer<InventoryClickEvent, Slot> onShiftRightClick,
                    @Nullable final BiConsumer<InventoryClickEvent, Slot> onMiddleClick) {
         this.provider = provider;
-        this.onLeftClick = onLeftClick == null ? ((event, slot) -> {
-        }) : onLeftClick;
-        this.onRightClick = onRightClick == null ? ((event, slot) -> {
-        }) : onRightClick;
-        this.onShiftLeftClick = onShiftLeftClick == null ? ((event, slot) -> {
-        }) : onShiftLeftClick;
-        this.onShiftRightClick = onShiftRightClick == null ? ((event, slot) -> {
-        }) : onShiftRightClick;
-        this.onMiddleClick = onMiddleClick == null ? ((event, slot) -> {
-        }) : onMiddleClick;
+        this.onLeftClick = onLeftClick == null ? NOOP : onLeftClick;
+        this.onRightClick = onRightClick == null ? NOOP : onRightClick;
+        this.onShiftLeftClick = onShiftLeftClick == null ? NOOP : onShiftLeftClick;
+        this.onShiftRightClick = onShiftRightClick == null ? NOOP : onShiftRightClick;
+        this.onMiddleClick = onMiddleClick == null ? NOOP : onMiddleClick;
     }
 
     public void handleInventoryClick(@NotNull final InventoryClickEvent event) {