diff --git a/ItemDisguise/.classpath b/ItemDisguise/.classpath
index 71e70473..2bda6dc7 100644
--- a/ItemDisguise/.classpath
+++ b/ItemDisguise/.classpath
@@ -7,6 +7,12 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/ProtocolLib"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java
index 5a9be055..6816610b 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java
@@ -537,6 +537,11 @@ class ProxyPlayerInjectionHandler implements PlayerInjectionHandler {
 		if (injector == null) {
 			// Try getting it from the player itself
 			SocketAddress address = player.getAddress();
+			
+			// Must have logged out - there's nothing we can do
+			if (address == null)
+				return null;
+			
 			// Look that up without blocking
 			SocketInjector result = inputStreamLookup.peekSocketInjector(address);