diff --git a/Analysis/ExplodedGraph.cpp b/Analysis/ExplodedGraph.cpp
index 35e9d9d..1cfb02c 100644
--- a/Analysis/ExplodedGraph.cpp
+++ b/Analysis/ExplodedGraph.cpp
@@ -60,7 +60,7 @@
 
 ExplodedNodeImpl** ExplodedNodeImpl::NodeGroup::end() const {
   if (getKind() == Size1)
-    return ((ExplodedNodeImpl**) &P)+1;
+    return (ExplodedNodeImpl**) (P ? &P+1 : &P);
   else
     return const_cast<ExplodedNodeImpl**>(&*(getVector(getPtr()).rbegin())+1);
 }
diff --git a/Analysis/GREngine.cpp b/Analysis/GREngine.cpp
index 42951fc..f0c59cf 100644
--- a/Analysis/GREngine.cpp
+++ b/Analysis/GREngine.cpp
@@ -167,7 +167,7 @@
     HandleBlockExit(B, Pred);
   else {
     GRNodeBuilderImpl Builder(B, StmtIdx, Pred, this);
-    ProcessStmt(L.getStmt(), Builder);
+    ProcessStmt((*B)[StmtIdx], Builder);
   }
 }