diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelStatic.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelStatic.java
index fa8737293..782666760 100644
--- a/src/main/java/appeng/parts/p2p/PartP2PTunnelStatic.java
+++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelStatic.java
@@ -43,6 +43,6 @@ public abstract class PartP2PTunnelStatic<T extends PartP2PTunnelStatic> extends
 
     @Override
     protected boolean checkIfCompatibleType(final IPart testPart) {
-        return this.getClass().isInstance(testPart);
+        return testPart != null && testPart.getClass() == this.getClass();
     }
 }