diff --git a/IDEHelper/Compiler/BfResolvePass.cpp b/IDEHelper/Compiler/BfResolvePass.cpp
index c7bfcf64..aa3cdcc5 100644
--- a/IDEHelper/Compiler/BfResolvePass.cpp
+++ b/IDEHelper/Compiler/BfResolvePass.cpp
@@ -199,6 +199,8 @@ BfSourceClassifier* BfResolvePassData::GetSourceClassifier(BfAstNode* astNode)
 {
 	if (!mIsClassifying)
 		return NULL;
+	if (astNode == NULL)
+		return NULL;
 	auto parser = astNode->GetParser();
 	if (parser == NULL)
 		return NULL;
@@ -209,5 +211,7 @@ BfSourceClassifier* BfResolvePassData::GetSourceClassifier(BfParser* parser)
 {
 	if (!mIsClassifying)
 		return NULL;
+	if (parser == NULL)
+		return NULL;
 	return parser->mSourceClassifier;
 }