diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 3aca20c83..281e419b8 100644
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -1707,7 +1707,8 @@ tr_torrentSetFilePriorities( tr_torrent *      tor,
     tr_torrentLock( tor );
 
     for( i = 0; i < fileCount; ++i )
-        tr_torrentInitFilePriority( tor, files[i], priority );
+        if( files[i] < tor->info.fileCount )
+            tr_torrentInitFilePriority( tor, files[i], priority );
     tr_torrentSetDirty( tor );
     tr_peerMgrRebuildRequests( tor );
 
@@ -1837,7 +1838,9 @@ tr_torrentInitFileDLs( tr_torrent      * tor,
     tr_torrentLock( tor );
 
     for( i=0; i<fileCount; ++i )
-        setFileDND( tor, files[i], doDownload );
+        if( files[i] < tor->info.fileCount )
+            setFileDND( tor, files[i], doDownload );
+
     tr_cpInvalidateDND( &tor->completion );
     tor->needsSeedRatioCheck = TRUE;