diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
index 8f582769e..7f9b5321f 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
@@ -197,19 +197,21 @@ public class EssentialsUpgrade
 			{
 				@SuppressWarnings("unchecked")
 				List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home");
-				World world = ess.getServer().getWorlds().get(0);
-				if (vals.size() > 5)
-				{
-					world = ess.getWorld((String)vals.get(5));
-				}
-				if (world != null)
-				{
-					user.setHome(new Location(world,
-											  ((Number)vals.get(0)).doubleValue(),
-											  ((Number)vals.get(1)).doubleValue(),
-											  ((Number)vals.get(2)).doubleValue(),
-											  ((Number)vals.get(3)).floatValue(),
-											  ((Number)vals.get(4)).floatValue()), true);
+				if (vals != null) {
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = ess.getWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						user.setHome(new Location(world,
+												  ((Number)vals.get(0)).doubleValue(),
+												  ((Number)vals.get(1)).doubleValue(),
+												  ((Number)vals.get(2)).doubleValue(),
+												  ((Number)vals.get(3)).floatValue(),
+												  ((Number)vals.get(4)).floatValue()), true);
+					}
 				}
 			}
 		}