diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java b/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java
index a49872c44..62def6832 100644
--- a/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java
+++ b/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java
@@ -1,5 +1,7 @@
 package world.bentobox.bentobox.api.placeholders;
 
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
@@ -12,5 +14,6 @@ import world.bentobox.bentobox.database.objects.Island;
 @FunctionalInterface
 public interface GameModePlaceholderReplacer {
 
-    String onReplace(GameModeAddon addon, User user, Island island);
+    @NonNull
+    String onReplace(@NonNull GameModeAddon addon, @Nullable User user, @Nullable Island island);
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java
index 6725faf73..2bd57b25b 100644
--- a/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java
+++ b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java
@@ -1,9 +1,12 @@
 package world.bentobox.bentobox.api.placeholders;
 
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import world.bentobox.bentobox.api.user.User;
 
 @FunctionalInterface
 public interface PlaceholderReplacer {
 
-    String onReplace(User user);
+    @NonNull
+    String onReplace(@Nullable User user);
 }