diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 015c4a14e53..617a0dabdb7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-01  Richard Guenther  <rguenther@suse.de>
+
+	* tree-ssa-loop-manip.c (ip_normal_pos): Check if last stmt
+	is NULL.
+
 2007-05-01  Joseph Myers  <joseph@codesourcery.com>
 
 	* config/rs6000/libgcc-ppc-glibc.ver (__gcc_qgt): Fix typo.
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 7611a6f2a5d..3416df32d3c 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -505,7 +505,8 @@ ip_normal_pos (struct loop *loop)
 
   bb = single_pred (loop->latch);
   last = last_stmt (bb);
-  if (TREE_CODE (last) != COND_EXPR)
+  if (!last
+      || TREE_CODE (last) != COND_EXPR)
     return NULL;
 
   exit = EDGE_SUCC (bb, 0);