diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f3db969cf6..98a28e66174 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-21  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/37181
+	* tree-vrp.c (extract_range_from_binary_expr): Check for NULL
+	folding result.
+	(extract_range_from_unary_expr): Likewise.
+
 2008-08-21  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
 	* diagnostic.c (pedwarn_at): Rename as pedwarn.
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index a71002fd9e4..a61f292c43f 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -2062,7 +2062,8 @@ extract_range_from_binary_expr (value_range_t *vr,
 	  && (op1 = op_with_constant_singleton_value_range (op1)) != NULL_TREE)
 	{
 	  tree tem = fold_binary (code, expr_type, op0, op1);
-	  if (is_gimple_min_invariant (tem)
+	  if (tem
+	      && is_gimple_min_invariant (tem)
 	      && !is_overflow_infinity (tem))
 	    {
 	      set_value_range (vr, VR_RANGE, tem, tem, NULL);
@@ -2477,7 +2478,8 @@ extract_range_from_unary_expr (value_range_t *vr, enum tree_code code,
       if ((op0 = op_with_constant_singleton_value_range (op0)) != NULL_TREE)
 	{
 	  tree tem = fold_unary (code, type, op0);
-	  if (is_gimple_min_invariant (tem)
+	  if (tem
+	      && is_gimple_min_invariant (tem)
 	      && !is_overflow_infinity (tem))
 	    {
 	      set_value_range (vr, VR_RANGE, tem, tem, NULL);