@@ -, +, @@ 
 failure
---
 src/shell-app-system.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
--- a/src/shell-app-system.c	
+++ a/src/shell-app-system.c	
@@ -321,7 +321,8 @@ on_apps_tree_changed_cb (GMenuTree *tree,
 
   if (!gmenu_tree_load_sync (self->priv->apps_tree, &error))
     {
-      g_warning ("Failed to load apps: %s", error->message);
+      g_warning ("Failed to load apps: %s",
+          (error != NULL) ? error->message : "unknown error");
       return;
     }
 
@@ -412,7 +413,8 @@ on_settings_tree_changed_cb (GMenuTree *tree,
   g_hash_table_remove_all (self->priv->setting_id_to_app);
   if (!gmenu_tree_load_sync (self->priv->settings_tree, &error))
     {
-      g_warning ("Failed to load settings: %s", error->message);
+      g_warning ("Failed to load settings: %s",
+          (error != NULL) ? error->message : "unknown error");
       return;
     }
 
--