diff --git a/core/features/registries/P2PTunnelRegistry.java b/core/features/registries/P2PTunnelRegistry.java
index 70a31b8b0..6000e4fab 100644
--- a/core/features/registries/P2PTunnelRegistry.java
+++ b/core/features/registries/P2PTunnelRegistry.java
@@ -71,7 +71,7 @@ public class P2PTunnelRegistry implements IP2PTunnelRegistry
 	@Override
 	public void addNewAttunement(ItemStack trigger, TunnelType type)
 	{
-		if ( type == null )
+		if ( type == null || trigger == null )
 			return;
 
 		Tunnels.put( trigger, type );