diff --git a/extension.cpp b/extension.cpp
index fa64831..65fdccd 100644
--- a/extension.cpp
+++ b/extension.cpp
@@ -42,6 +42,9 @@ DETOUR_DECL_STATIC2( PassServerEntityFilterFunc, bool, const IHandleEntity *, pT
 	if ( pTouch == pPass )
 		return DETOUR_STATIC_CALL( PassServerEntityFilterFunc )( pTouch, pPass ); // self checks aren't interesting
 
+	if ( !pTouch || !pPass )
+		return DETOUR_STATIC_CALL( PassServerEntityFilterFunc )( pTouch, pPass ); // need two valid entities
+
 	CBaseEntity *pEnt1 = const_cast<CBaseEntity *>( UTIL_EntityFromEntityHandle( pTouch ) );
 	CBaseEntity *pEnt2 = const_cast<CBaseEntity *>( UTIL_EntityFromEntityHandle( pPass ) );
 
diff --git a/sdk/smsdk_config.h b/sdk/smsdk_config.h
index 073b723..173b494 100644
--- a/sdk/smsdk_config.h
+++ b/sdk/smsdk_config.h
@@ -40,7 +40,7 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"CollisionHooks"
 #define SMEXT_CONF_DESCRIPTION	"Hook on entity collision"
-#define SMEXT_CONF_VERSION		"0.1"
+#define SMEXT_CONF_VERSION		"0.2"
 #define SMEXT_CONF_AUTHOR		"VoiDeD"
 #define SMEXT_CONF_URL			"http://saxtonhell.com"
 #define SMEXT_CONF_LOGTAG		"CLHOOK"
diff --git a/sourcemod/extensions/collisionhook.ext.dll b/sourcemod/extensions/collisionhook.ext.dll
index 0b8835b..d60f117 100644
Binary files a/sourcemod/extensions/collisionhook.ext.dll and b/sourcemod/extensions/collisionhook.ext.dll differ
diff --git a/sourcemod/extensions/collisionhook.ext.pdb b/sourcemod/extensions/collisionhook.ext.pdb
index 9ba1d79..b907a85 100644
Binary files a/sourcemod/extensions/collisionhook.ext.pdb and b/sourcemod/extensions/collisionhook.ext.pdb differ