diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 883170122..38b278fae 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -1320,7 +1320,7 @@ tr_peerMgrPeerStats( const tr_peerMgr  * manager,
         tr_netNtop( &peer->in_addr, stat->addr, sizeof(stat->addr) );
         stat->port             = peer->port;
         stat->from             = atom->from;
-        stat->client           = peer->client;
+        stat->client           = tr_strdup( peer->client ? peer->client : "" );
         stat->progress         = peer->progress;
         stat->isEncrypted      = tr_peerIoIsEncrypted( peer->io ) ? 1 : 0;
         stat->uploadToRate     = tr_rcRate( peer->rateToPeer );
diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 8ecbb3f98..b4f4c456c 100644
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -904,8 +904,12 @@ tr_torrentPeers( const tr_torrent * tor, int * peerCount )
                                 tor->info.hash, peerCount );
 }
 
-void tr_torrentPeersFree( tr_peer_stat * peers, int peerCount UNUSED )
+void
+tr_torrentPeersFree( tr_peer_stat * peers, int peerCount )
 {
+    int i;
+    for( i=0; i<peerCount; ++i )
+        tr_free( (char*) peers[i].client );
     tr_free( peers );
 }