diff --git a/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java b/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java
index 675b98c3..f9ab6f32 100644
--- a/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java
+++ b/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java
@@ -95,7 +95,7 @@ public class DSavePlayer {
 				}
 			}
 			
-			if ( !offline) {
+			if ( !offline && oldLocation.getWorld() != null) {
 				MiscUtil.secureTeleport(player, oldLocation);
 			}