diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
index 2dd536f2..4f396ee4 100644
--- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp
+++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
@@ -9504,7 +9504,10 @@ BfType* BfModule::ResolveSelfType(BfType* type, BfType* selfType)
 {
 	if (!type->IsUnspecializedTypeVariation())
 		return type;
-	return ResolveGenericType(type, NULL, NULL, selfType);
+	BfType* resolvedType = ResolveGenericType(type, NULL, NULL, selfType);
+	if (resolvedType != NULL)
+		return resolvedType;
+	return type;
 }
 
 BfType* BfModule::ResolveType(BfType* lookupType, BfPopulateType populateType, BfResolveTypeRefFlags resolveFlags)