diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index c60c79892..f3658e6d9 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -75,10 +75,18 @@ _e_startup_next_cb(void *data __UNUSED__)
 }
 
 static Eina_Bool
-_e_startup_event_cb(void *data, int ev_type __UNUSED__, void *ev __UNUSED__)
+_e_startup_event_cb(void *data, int ev_type __UNUSED__, void *ev)
 {
    char *buf;
+#if (EFREET_VERSION_MAJOR > 1) || (EFREET_VERSION_MINOR >= 8)
+   Efreet_Event_Cache_Update *e;
 
+   e = ev;
+   /* TODO: Tell user he should fix his dbus setup */
+   if ((e) && (e->error))
+     fprintf(stderr, "E: efreet couldn't build cache\n");
+
+#endif
    ecore_event_handler_del(desktop_cache_update_handler);
    buf = data;
    startup_apps = e_order_new(buf);
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index f598e5012..1aac21fda 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -455,7 +455,8 @@ _e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void
 
    e = ev;
    /* TODO: Tell user he should fix his dbus setup */
-   xdg_error = !!e->error;
+   if ((e) && (e->error))
+     xdg_error = EINA_TRUE;
 
 #endif
    got_desktops = EINA_TRUE;