diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index dcc339564..14f2faf2e 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -3156,9 +3156,12 @@ rechokePulse( int foo UNUSED, short bar UNUSED, void * vmgr )
 
     while(( tor = tr_torrentNext( mgr->session, tor ))) {
         if( tor->isRunning ) {
-            rechokeUploads( tor->torrentPeers, now );
+            Torrent * t = tor->torrentPeers;
+            if( tr_ptrArraySize( &t->peers ) == 0 )
+                continue;
+            rechokeUploads( t, now );
             if( !tr_torrentIsSeed( tor ) )
-                rechokeDownloads( tor->torrentPeers );
+                rechokeDownloads( t );
         }
     }