diff --git a/ChangeLog b/ChangeLog
index bca1f533e..c5308f422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,7 @@ release 0.14.6
 	* fixed bug where web seeds would not disconnect if being resolved when
 	  the torrent was paused
 	* fixed download piece performance bug in piece picker
+	* fixed bug in connect candidate counter
 
 release 0.14.5
 
diff --git a/include/libtorrent/peer_connection.hpp b/include/libtorrent/peer_connection.hpp
index 29607405e..70ca422f0 100644
--- a/include/libtorrent/peer_connection.hpp
+++ b/include/libtorrent/peer_connection.hpp
@@ -167,7 +167,10 @@ namespace libtorrent
 		virtual ~peer_connection();
 
 		void set_peer_info(policy::peer* pi)
-		{ m_peer_info = pi; }
+		{
+			TORRENT_ASSERT(m_peer_info == 0 || pi == 0 );
+			m_peer_info = pi;
+		}
 
 		policy::peer* peer_info_struct() const
 		{ return m_peer_info; }