diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 66a452541..c2159a17b 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -504,6 +504,9 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
 			if (vals.size() > 5 && getServer() != null) {
 				world = getServer().getWorld((String)vals.get(5));
 			}
+			if (world == null) {
+				throw new Exception();
+			}
 			return new Location(
 					world,
 					((Number)vals.get(0)).doubleValue(),
@@ -521,6 +524,9 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
 			if (vals.size() > 5) {
 				world = getServer().getWorld((String)vals.get(5));
 			}
+			if (world == null) {
+				throw new Exception();
+			}
 			return new Location(world,
 						((Number)vals.get(0)).doubleValue(),
 						((Number)vals.get(1)).doubleValue(),