diff --git a/src/main/java/org/dynmap/DynmapPlayerChatListener.java b/src/main/java/org/dynmap/DynmapPlayerChatListener.java
index f7676e34..c732f855 100644
--- a/src/main/java/org/dynmap/DynmapPlayerChatListener.java
+++ b/src/main/java/org/dynmap/DynmapPlayerChatListener.java
@@ -15,17 +15,17 @@ public class DynmapPlayerChatListener extends PlayerListener {
     @Override
     public void onPlayerChat(PlayerChatEvent event) {
         if(event.isCancelled()) return;
-        plugin.mapManager.pushUpdate(new Client.ChatMessage("player", event.getPlayer().getDisplayName(), event.getMessage()));
+        plugin.mapManager.pushUpdate(new Client.ChatMessage("player", event.getPlayer().getName(), event.getMessage()));
     }
 
     @Override
     public void onPlayerJoin(PlayerJoinEvent event) {
-        plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getDisplayName()));
+        plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getName()));
     }
 
     @Override
     public void onPlayerQuit(PlayerQuitEvent event) {
-        plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getDisplayName()));
+        plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getName()));
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java
index 13701e32..f1e3e00f 100644
--- a/src/main/java/org/dynmap/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/DynmapPlugin.java
@@ -349,11 +349,14 @@ public class DynmapPlugin extends JavaPlugin {
                 if (args.length > 1) {
                     for (int i = 1; i < args.length; i++) {
                         World w = getServer().getWorld(args[i]);
-                        mapManager.renderFullWorld(new Location(w, 0, 0, 0));
+                        if(w != null)
+                        	mapManager.renderFullWorld(new Location(w, 0, 0, 0));
                     }
                     return true;
                 } else if (player != null) {
-                    mapManager.renderFullWorld(player.getLocation());
+                	Location loc = player.getLocation();
+                	if(loc != null)
+                		mapManager.renderFullWorld(loc);
                     return true;
                 }
             }