diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java
index 5b37706..3a812f5 100644
--- a/src/main/java/us/ajg0702/queue/Manager.java
+++ b/src/main/java/us/ajg0702/queue/Manager.java
@@ -539,9 +539,17 @@ public class Manager {
 			}
 			
 			ProxiedPlayer nextplayer = s.getQueue().get(0);
+			if(nextplayer == null) {
+				if(s.getQueue().size() > 0) {
+					s.getQueue().remove(0);
+				}
+				continue;
+			}
 			
 			if(!s.canAccess(nextplayer)) continue;
 			
+			
+			
 			while(nextplayer.getServer().getInfo().getName().equals(s.getName())) {
 				s.getQueue().remove(nextplayer);
 				if(s.getQueue().size() <= 0) break;