diff --git a/src/main/java/com/Acrobot/ChestShop/UUIDs/UUIDSaver.java b/src/main/java/com/Acrobot/ChestShop/UUIDs/UUIDSaver.java
index b923f24..abdaf51 100644
--- a/src/main/java/com/Acrobot/ChestShop/UUIDs/UUIDSaver.java
+++ b/src/main/java/com/Acrobot/ChestShop/UUIDs/UUIDSaver.java
@@ -61,6 +61,10 @@ public class UUIDSaver {
             return null;
         }
 
+        if (account == null) {
+            return null;
+        }
+
         return account.getName();
     }
 
@@ -75,6 +79,10 @@ public class UUIDSaver {
             return null;
         }
 
+        if (account == null) {
+            return username;
+        }
+
         return account.getName();
     }