diff --git a/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java b/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java
index af25eaa1..a28788ce 100644
--- a/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java
+++ b/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java
@@ -97,7 +97,8 @@ class PacketProcessingQueue extends AbstractConcurrentListenerMultimap<AsyncList
 				signalProcessingDone();
 				
 			} else {
-				// No more queued packets. 
+				// No more queued packets.
+				signalProcessingDone();
 				return;
 			}
  		}
diff --git a/ProtocolLib/src/com/comphenix/protocol/injector/PacketFilterManager.java b/ProtocolLib/src/com/comphenix/protocol/injector/PacketFilterManager.java
index 1dfb5bf9..0288ea1d 100644
--- a/ProtocolLib/src/com/comphenix/protocol/injector/PacketFilterManager.java
+++ b/ProtocolLib/src/com/comphenix/protocol/injector/PacketFilterManager.java
@@ -105,7 +105,7 @@ public final class PacketFilterManager implements ProtocolManager {
 	private SortedPacketListenerList sendingListeners = new SortedPacketListenerList();
 	
 	// Whether or not this class has been closed
-	private boolean hasClosed;
+	private volatile boolean hasClosed;
 	
 	// The default class loader
 	private ClassLoader classLoader;
@@ -700,23 +700,26 @@ public final class PacketFilterManager implements ProtocolManager {
 	
 	public void close() {
 		// Guard
-		if (hasClosed)
+		if (hasClosed || playerInjection == null)
 			return;
-		
+
 		// Remove everything
 		for (PlayerInjector injection : playerInjection.values()) {
-			injection.cleanupAll();
+			if (injection != null) {
+				injection.cleanupAll();
+			}
 		}
 
 		// Remove packet handlers
 		if (packetInjector != null)
 			packetInjector.cleanupAll();
 		
+		hasClosed = true;
+		
 		// Remove listeners
 		packetListeners.clear();
 		playerInjection.clear();
 		connectionLookup.clear();
-		hasClosed = true;
 		
 		// Clean up async handlers. We have to do this last.
 		asyncFilterManager.cleanupAll();