diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
index a96a5046..70003a24 100644
--- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp
+++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
@@ -129,6 +129,9 @@ bool BfModule::InitGenericParams(BfType* resolvedTypeRef)
 	auto genericTypeInst = resolvedTypeRef->ToGenericTypeInstance();
 	genericTypeInst->mGenericTypeInfo->mInitializedGenericParams = true;
 
+	if (genericTypeInst->mGenericTypeInfo->mTypeGenericArguments.IsEmpty())
+		return true;
+
 	if (genericTypeInst->mGenericTypeInfo->mTypeGenericArguments[0]->IsGenericParam())
 	{
 		BF_ASSERT(genericTypeInst->mGenericTypeInfo->mIsUnspecialized);
@@ -9062,10 +9065,7 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
 			if (type->IsUnspecializedType())
 				isUnspecialized = true;
 			BF_ASSERT(!type->IsVar());
-// 			if (type->IsVar())
-// 				isUnspecialized = true;
 
-			String typeName = TypeToString(type);
 			types.push_back(type);
 			names.push_back(fieldName);
 		}
diff --git a/IDEHelper/Compiler/BfResolvedTypeUtils.cpp b/IDEHelper/Compiler/BfResolvedTypeUtils.cpp
index 7d969616..71851fd1 100644
--- a/IDEHelper/Compiler/BfResolvedTypeUtils.cpp
+++ b/IDEHelper/Compiler/BfResolvedTypeUtils.cpp
@@ -2239,7 +2239,7 @@ BfType* BfTypeInstance::GetUnderlyingType()
 {
 	if (!mIsTypedPrimitive)
 	{
-		if (mGenericTypeInfo != NULL)
+		if ((mGenericTypeInfo != NULL) && (!mGenericTypeInfo->mTypeGenericArguments.IsEmpty()))
 			return mGenericTypeInfo->mTypeGenericArguments[0];
 		return NULL;
 	}