diff --git a/IDEHelper/Compiler/BfCompiler.cpp b/IDEHelper/Compiler/BfCompiler.cpp
index 0c931410..67f41fe7 100644
--- a/IDEHelper/Compiler/BfCompiler.cpp
+++ b/IDEHelper/Compiler/BfCompiler.cpp
@@ -4957,7 +4957,7 @@ void BfCompiler::GetSymbolReferences()
 				auto typeDef = lookupKV.mValue.mTypeDef;
 				if ((typeDef != NULL) && (typeDef->mNamespace.StartsWith(mResolvePassData->mSymbolReferenceNamespace)))
 				{
-					rebuildTypeInstList.Add(typeInst);
+					AddToRebuildTypeList(typeInst, rebuildTypeInstList);
 				}
 			}
 		}
diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
index 8c824f32..a691017d 100644
--- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp
+++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
@@ -8983,7 +8983,7 @@ BfGenericParamInstance* BfModule::GetGenericParamInstance(BfGenericParamType* ty
 {
 	if (type->mGenericParamKind == BfGenericParamKind_Method)
 	{
-		if ((mCurMethodInstance->mMethodInfoEx == NULL) || (type->mGenericParamIdx >= mCurMethodInstance->mMethodInfoEx->mGenericParams.mSize))
+		if ((mCurMethodInstance == NULL) || (mCurMethodInstance->mMethodInfoEx == NULL) || (type->mGenericParamIdx >= mCurMethodInstance->mMethodInfoEx->mGenericParams.mSize))
 		{
 			FatalError("Invalid GetGenericParamInstance method generic param");
 			return NULL;