diff --git a/src/main/java/org/mvplugins/multiverse/core/PlaceholderExpansionHook.java b/src/main/java/org/mvplugins/multiverse/core/PlaceholderExpansionHook.java
index e4bd696b2..1c638a2ae 100644
--- a/src/main/java/org/mvplugins/multiverse/core/PlaceholderExpansionHook.java
+++ b/src/main/java/org/mvplugins/multiverse/core/PlaceholderExpansionHook.java
@@ -113,7 +113,7 @@ public boolean persist() {
                 return Option.of(player.getWorld().getName());
             } else {
                 warning("You must specify a world name for non-player placeholders");
-                return null;
+                return Option.none();
             }
         }