diff --git a/extensions/sdktools/output.cpp b/extensions/sdktools/output.cpp
index 08075610..31d6caa0 100644
--- a/extensions/sdktools/output.cpp
+++ b/extensions/sdktools/output.cpp
@@ -116,8 +116,12 @@ void EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator
 	if ((fastLookup = EntityOutputs->Retrieve(sOutput, (void **)&pOutputName)) == false)
 	{
 		const char *classname = GetEntityClassname(pCaller);
-		const char *outputname = FindOutputName(pOutput, pCaller);
-		
+		if (!classname)
+		{
+			return;
+		}
+
+		const char *outputname = FindOutputName(pOutput, pCaller);		
 		if (!outputname)
 		{
 			return;