diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index 1d1f64fa5..a5d207b39 100644
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -810,9 +810,9 @@ tr_core_session( TrCore * core )
 static char*
 doCollate( const char * in )
 {
-    const char * end = in + strlen( in );
-    char *       casefold;
-    char *       ret;
+    char * ret;
+    char * casefold;
+    const char * end = in ? in + strlen( in ) : NULL;
 
     while( in < end )
     {
diff --git a/gtk/tr-window.c b/gtk/tr-window.c
index 2be709ca7..3d04bdcec 100644
--- a/gtk/tr-window.c
+++ b/gtk/tr-window.c
@@ -389,9 +389,13 @@ checkFilterText( filter_text_mode_t    filter_text_mode,
             break;
 
         default: /* NAME */
-            pch = g_utf8_casefold( inf->name, -1 );
-            ret = !text || ( strstr( pch, text ) != NULL );
-            g_free( pch );
+            if( !inf->name )
+                ret = TRUE;
+            else {
+                pch = g_utf8_casefold( inf->name, -1 );
+                ret = !text || ( strstr( pch, text ) != NULL );
+                g_free( pch );
+            }
             break;
     }