diff --git a/include/boost/graph/detail/adj_list_edge_iterator.hpp b/include/boost/graph/detail/adj_list_edge_iterator.hpp
index b1f9f341..f02d4477 100644
--- a/include/boost/graph/detail/adj_list_edge_iterator.hpp
+++ b/include/boost/graph/detail/adj_list_edge_iterator.hpp
@@ -59,7 +59,8 @@ namespace boost {
         if ( vCurr != vEnd ) {
           while ( vCurr != vEnd && out_degree(*vCurr, *m_g) == 0 )
             ++vCurr;
-	  tie(eCurr, eEnd) = out_edges(*vCurr, *m_g);
+	  if ( vCurr != vEnd )
+	    tie(eCurr, eEnd) = out_edges(*vCurr, *m_g);
         }
       }