diff --git a/src/main/java/thebetweenlands/common/command/CommandBLEvent.java b/src/main/java/thebetweenlands/common/command/CommandBLEvent.java
index 466ef6ad1..12dcec89d 100644
--- a/src/main/java/thebetweenlands/common/command/CommandBLEvent.java
+++ b/src/main/java/thebetweenlands/common/command/CommandBLEvent.java
@@ -116,7 +116,7 @@ private void processEventState(ICommandSender sender, ResourceLocation eventName
 
 	@Override
 	public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
-		if (BetweenlandsWorldStorage.forWorld(sender.getEntityWorld()) == null) {
+		if (BetweenlandsWorldStorage.forWorldNullable(sender.getEntityWorld()) == null) {
 			return Collections.<String>emptyList();
 		}
 		List<String> completions = null;
diff --git a/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java b/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java
index f23b9b49f..ac96c3ede 100644
--- a/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java
+++ b/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java
@@ -26,7 +26,7 @@ private EnvironmentEventHandler() { }
 	@SubscribeEvent
 	public static void onWorldTick(WorldTickEvent event) {
 		if(event.phase == Phase.END && !event.world.isRemote) {
-			BetweenlandsWorldStorage storage = BetweenlandsWorldStorage.forWorld(event.world);
+			BetweenlandsWorldStorage storage = BetweenlandsWorldStorage.forWorldNullable(event.world);
 
 			if(storage != null) {
 				BLEnvironmentEventRegistry reg = storage.getEnvironmentEventRegistry();