diff --git a/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java b/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java
index 97d3963..2967929 100644
--- a/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java
+++ b/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java
@@ -57,11 +57,11 @@ public static void incrementWaiting(Entity entity){
     }
 
     public static int getWaitingTime(Entity entity){
-        return waiting.get(entity.getUniqueId());
+        return waiting.getOrDefault(entity.getUniqueId(), -1);
     }
 
     public static int getSize(Entity entity){
-        return currentEntities.get(entity.getUniqueId());
+        return currentEntities.getOrDefault(entity.getUniqueId(), 1);
     }
 
     public static void setSize(Entity entity, int newSize){