diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 5084b5dc6..a3271ec3d 100644
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -254,7 +254,7 @@ tr_fdFileCheckout( const char * filename, int write )
         }
 
         if( winner >= 0 ) {
-            if( fileIsOpen( &gFd->open[i] ) ) {
+            if( fileIsOpen( &gFd->open[winner] ) ) {
                 dbgmsg( "closing file '%s', slot #%d", gFd->open[winner].filename, winner );
                 TrCloseFile( winner );
             }
diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 494f727be..b5698ce05 100644
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -228,6 +228,9 @@ tr_msg( const char * file, int line, int level, const char * fmt, ... )
 
                 *messageQueueTail = newmsg;
                 messageQueueTail = &newmsg->next;
+
+                if( strstr( file, "fdlimit.c" ) )
+                    fprintf( stderr, "%s\n", text );
             }
             else
             {