diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index f82aec91a..a83db16e3 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -438,11 +438,13 @@ public class Essentials extends JavaPlugin implements IEssentials
 		{
 			return (User)base;
 		}
-		User user = userMap.getUser(base.getName()).update(base);
+		User user = userMap.getUser(base.getName());
 
 		if (user == null)
 		{
 			user = new User(base, this);
+		} else {
+			user.update(base);
 		}
 		return user;
 	}