diff --git a/core/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java b/core/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java
index ba7b8c0c5..b798d36ee 100644
--- a/core/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java
+++ b/core/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java
@@ -332,7 +332,7 @@ public class SqlStorage implements StorageImplementation {
                         plugin.getLogger().severe("Quest was null for completed times of quester " + quester.getUUID());
                         return;
                     }
-                    if (!quester.getAmountsCompleted().containsKey(entry.getKey())) {
+                    if (!quester.getAmountsCompleted().containsKey(entry.getKey()) || quester.getAmountsCompleted().get(entry.getKey()) == null) {
                         plugin.getLogger().warning("Quester " + quester.getUUID() + " is missing amounts completed for quest ID " + entry.getKey().getId());
                         return;
                     }