diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index a1a5f1612..dd7726631 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -751,11 +751,14 @@ ThumbnailList.prototype = {
                                              height: height * scale });
             box.add_actor(clone);
 
-            let name = new St.Label({ text: windows[i].get_title() });
-            // St.Label doesn't support text-align so use a Bin
-            let bin = new St.Bin({ x_align: St.Align.MIDDLE });
-            bin.add_actor(name);
-            box.add_actor(bin);
+            let title = windows[i].get_title();
+            if (title) {
+                let name = new St.Label({ text: title });
+                // St.Label doesn't support text-align so use a Bin
+                let bin = new St.Bin({ x_align: St.Align.MIDDLE });
+                bin.add_actor(name);
+                box.add_actor(bin);
+            }
 
             this.addItem(box);
         }
diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 898fd0f95..2ec877472 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -740,6 +740,8 @@ shell_app_info_get_name (ShellAppInfo *info)
       {
         char *title;
         g_object_get (info->window, "title", &title, NULL);
+        if (!title)
+          title = g_strdup ("");
         return title;
       }
   }