diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp
index 4a48b7ae3..16e63728a 100644
--- a/src/bt_peer_connection.cpp
+++ b/src/bt_peer_connection.cpp
@@ -1261,8 +1261,8 @@ namespace libtorrent
 #endif
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
-		for (extension_list_t::iterator i = m_extensions.begin()
-			, end(m_extensions.end()); i != end;)
+		for (extension_list_t::iterator i = m_extensions.begin();
+			!m_extensions.empty() && i != m_extensions.end();)
 		{
 			// a false return value means that the extension
 			// isn't supported by the other end. So, it is removed.