diff --git a/libtransmission/torrent-magnet.c b/libtransmission/torrent-magnet.c
index a21550fa3..7ce61e313 100644
--- a/libtransmission/torrent-magnet.c
+++ b/libtransmission/torrent-magnet.c
@@ -306,14 +306,19 @@ tr_torrentGetMagnetLink( const tr_torrent * tor )
 {
     int i;
     char * ret;
+    const char * name;
     struct evbuffer * s;
 
     assert( tr_isTorrent( tor ) );
 
     s = evbuffer_new( );
     evbuffer_add_printf( s, "magnet:?xt=urn:btih:%s", tor->info.hashString );
-    evbuffer_add_printf( s, "%s", "&dn=" );
-    tr_http_escape( s, tr_torrentName( tor ), -1, TRUE );
+    name = tr_torrentName( tor );
+    if( name && *name )
+    {
+        evbuffer_add_printf( s, "%s", "&dn=" );
+        tr_http_escape( s, tr_torrentName( tor ), -1, TRUE );
+    }
     for( i=0; i<tor->info.trackerCount; ++i )
     {
         evbuffer_add_printf( s, "%s", "&tr=" );