diff --git a/src/bin/empc.c b/src/bin/empc.c
index b73343f..148352a 100644
--- a/src/bin/empc.c
+++ b/src/bin/empc.c
@@ -862,7 +862,7 @@ static Evas_Object *
 filesystem_item_content_get(Empc_Entity *ent, Evas_Object *obj, const char *part EINA_UNUSED)
 {
    Empc_Fetch_Request *req;
-   Evas_Object *cur;
+   Evas_Object *cur = NULL;
 
    switch (ent->type)
      {
@@ -1499,6 +1499,8 @@ queue_list_delete_inverted(void)
              hdr = elm_genlist_item_parent_get(it);
              headers = eina_list_append(headers, hdr);
           }
+        next = elm_genlist_item_next_get(it);
+        prev = elm_genlist_item_prev_get(it);
         so = elm_object_item_data_get(next);
         if (it == empd_song_item)
           del_playing = 0;
@@ -1508,8 +1510,6 @@ queue_list_delete_inverted(void)
              empd_empc_play_id_call(empd_proxy, so->songid);
              del_playing = 0;
           }
-        next = elm_genlist_item_next_get(it);
-        prev = elm_genlist_item_prev_get(it);
         /* fragmentation detected */
         if (next != eina_list_data_get(l->next))
           {
@@ -2284,7 +2284,7 @@ key_down(void *data EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Key *ev)
                   if ((!so) || (soi->song_pos > so->song_pos))
                     so = soi;
                }
-             if ((unsigned int)so->song_pos == empd_queue_length - 1)
+             if (so && ((unsigned int)so->song_pos == empd_queue_length - 1))
                so = NULL;
              if (!clipboard_paste(so ? so->song_pos + 1 : (long long)empd_queue_length))
                return ECORE_CALLBACK_RENEW;
diff --git a/src/bin/empc_metadata.c b/src/bin/empc_metadata.c
index c7dbc2c..b829639 100644
--- a/src/bin/empc_metadata.c
+++ b/src/bin/empc_metadata.c
@@ -185,7 +185,8 @@ metadata_fetch_begin(Empc_Metadata_Type type, Evas_Object *obj, const char *attr
       case EMPC_METADATA_TYPE_TEXT:
         ireq = metadata_fetch_req_new(attr1, NULL, attr2);
         break;
-      default: break;
+      default:
+        return NULL;
      }
    ireq->req.type = type;
    res = malloc(sizeof(Empc_Metadata_Result_Cb));
diff --git a/src/bin/empdd.c b/src/bin/empdd.c
index dd35d7e..2e32e1f 100644
--- a/src/bin/empdd.c
+++ b/src/bin/empdd.c
@@ -634,6 +634,8 @@ fdh_func(void *d EINA_UNUSED, Ecore_Fd_Handler *fdh EINA_UNUSED)
                         const char *track;
                         Eldbus_Message_Iter *struc, *variant, *s2;
 
+                        if (mpd_entity_get_type(ent) == MPD_ENTITY_TYPE_UNKNOWN) continue;
+
                         eldbus_message_iter_arguments_append(array, "(iv)", &struc);
                         eldbus_message_iter_basic_append(struc, 'i', mpd_entity_get_type(ent));
                         switch (mpd_entity_get_type(ent))
diff --git a/src/modules/eet_saver.c b/src/modules/eet_saver.c
index 0a82688..c056050 100644
--- a/src/modules/eet_saver.c
+++ b/src/modules/eet_saver.c
@@ -19,7 +19,7 @@ empc_module_metadata_save_image(Evas_Object *obj, const char *artist, const char
    void *img;
    int w, h;
    char buf[4096];
-   char *a, *b;
+   char *a = NULL, *b = NULL;
 
    if (artist)
      {
@@ -43,7 +43,7 @@ EAPI void
 empc_module_metadata_save_text(const char *text, const char *artist, const char *song)
 {
    char buf[4096];
-   char *a, *b;
+   char *a = NULL, *b = NULL;
 
    if (artist)
      {