diff --git a/Analysis/ValueState.cpp b/Analysis/ValueState.cpp
index db2ef6b..e175a1c 100644
--- a/Analysis/ValueState.cpp
+++ b/Analysis/ValueState.cpp
@@ -94,8 +94,15 @@
     Marked.insert(V);
     
     if (V->getType()->isPointerType()) {
-      const LVal& LV =
-        cast<LVal>(GetRVal(St, lval::DeclVal(cast<VarDecl>(V))));      
+      
+      RVal X = GetRVal(St, lval::DeclVal(cast<VarDecl>(V)));
+      
+      assert (!X.isUnknown());
+      
+      if (X.isUninit())
+        continue;
+      
+      LVal LV = cast<LVal>(X);
       
       for (RVal::symbol_iterator SI = LV.symbol_begin(), SE = LV.symbol_end();
                                                          SI != SE; ++SI) {
diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h
index f83f3d3..8e66b9c 100644
--- a/include/clang/Analysis/PathSensitive/GRExprEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h
@@ -367,6 +367,10 @@
     return R.isValid() ? TF->EvalBinOp(ValMgr, Op, L, cast<NonLVal>(R)) : R;
   }
   
+  RVal EvalBinOp(BinaryOperator::Opcode Op, NonLVal L, NonLVal R) {
+    return R.isValid() ? TF->EvalBinOp(ValMgr, Op, L, R) : R;
+  }
+  
   RVal EvalBinOp(BinaryOperator::Opcode Op, RVal L, RVal R) {
     
     if (L.isUninit() || R.isUninit())