1 files changed, 4 insertions, 0 deletions
diff --git a/src/compiler/Dataflow.cc b/src/compiler/Dataflow.cc
index 827470e2e4..d4b5339e0b 100644
--- a/src/compiler/Dataflow.cc
+++ b/src/compiler/Dataflow.cc
@@ -2405,6 +2405,10 @@ static bool eliminateNullChecks( struct CompilationUnit* cUnit,
             if (predBBIdx == -1) break;
             predBB = (BasicBlock*)oatGrowableListGetElement(
                 blockList, predBBIdx);
+            if ((predBB->dataFlowInfo == NULL) ||
+                (predBB->dataFlowInfo->endingNullCheckV == NULL)) {
+                continue;
+            }
             oatIntersectBitVectors(cUnit->tempSSARegisterV,
                 cUnit->tempSSARegisterV,
                 predBB->dataFlowInfo->endingNullCheckV);