diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
index 7d80579b..b3389f46 100644
--- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp
+++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
@@ -5186,7 +5186,9 @@ BfPrimitiveType* BfModule::GetPrimitiveType(BfTypeCode typeCode)
 		case BfTypeCode_StringId:
 			BFMODULE_FATAL(this, "Invalid use of StringId");
 			break;
-		default: break;
+		default: 
+			BF_DBG_FATAL("Invalid type");
+			break;
 		}
 		mContext->mPrimitiveTypes[typeCode] = primType;
 	}	
diff --git a/IDEHelper/Compiler/BfResolvedTypeUtils.h b/IDEHelper/Compiler/BfResolvedTypeUtils.h
index 5224d26c..9714eba1 100644
--- a/IDEHelper/Compiler/BfResolvedTypeUtils.h
+++ b/IDEHelper/Compiler/BfResolvedTypeUtils.h
@@ -576,7 +576,7 @@ public:
 	
 public:
 	virtual bool IsPrimitiveType() override { return true; }
-	virtual bool IsWrappableType() override { return true; }
+	virtual bool IsWrappableType() override { return (mTypeDef->mTypeCode >= BfTypeCode_Boolean) && (mTypeDef->mTypeCode <= BfTypeCode_Double); }
 	virtual BfPrimitiveType* ToPrimitiveType() override { return this; }
 	//virtual bool IsValueType() override { return mTypeDef->mTypeCode != BfTypeCode_None; }
 	//virtual bool IsValueTypeOrValueTypePtr() override { return mTypeDef->mTypeCode != BfTypeCode_None; }