diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 51fb5679d..9944267d9 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -1380,13 +1380,19 @@ namespace libtorrent
 		boost::shared_ptr<torrent> t = m_torrent.lock();
 		TORRENT_ASSERT(t);
 		if (m_upload_only && t->is_finished())
+		{
 			disconnect("seed to seed");
+			return;
+		}
 
 		if (m_upload_only
 			&& !m_interesting
 			&& m_bitfield_received
 			&& t->are_files_checked())
+		{
 			disconnect("uninteresting upload-only peer");
+			return;
+		}
 	}
 
 	// -----------------------------