diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 8d017cc64..ad4cba8c0 100755
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -1041,8 +1041,7 @@ namespace libtorrent
 				// peer that has taken over it.
 				boost::optional<tcp::endpoint> peer
 					= t->picker().get_downloader(block_finished);
-				assert(!t->picker().is_finished(block_finished));
-				if (peer)
+				if (!t->picker().is_finished(block_finished) && peer)
 				{
 					peer_connection* pc = t->connection_for(*peer);
 					if (pc && pc != this)