diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/MapCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/MapCommand.java
index 9867982df..9e80b231b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/MapCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/MapCommand.java
@@ -22,7 +22,7 @@ public class MapCommand extends CommandBase<ArcadeManager>
 	{
 		Game game = Plugin.GetGame();
 
-		if (game == null || game.WorldData == null)
+		if (game == null || game.WorldData == null || game.WorldData.MapName == null)
 		{
 			caller.sendMessage(F.main(Plugin.getName(), "Is this the work of an enemy stand? There's no map?"));
 			return;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
index 6bbd1c2de..7f3353225 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
@@ -50,8 +50,8 @@ public class WorldData
 	public int MinY = -1;
 	public int MaxY = 256;
 
-	public String MapName = "Null";
-	public String MapAuthor = "Null";
+	public String MapName;
+	public String MapAuthor;
 
 	public GameType Game = null;