summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/Essentials.java
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/Essentials.java')
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 117c3717d..a3457df12 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -561,8 +561,14 @@ public class Essentials extends JavaPlugin implements IEssentials
{
return (User)base;
}
- //Todo: catch this and deal with it?
- return userMap.getUser(base.getName()).update(base);
+ try
+ {
+ return userMap.getUser(base.getName()).update(base);
+ }
+ catch (NullPointerException ex)
+ {
+ return null;
+ }
}
@Override