diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index af573f42c..d8f48dde4 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -462,7 +462,7 @@ evry_fuzzy_match(const char *str, const char *match)
    unsigned int last = 0;
    unsigned char first;
 
-   if (!match || !match[0] || !str || !str[0]) return 0;
+   if (!match || !str) return 0;
 
    for (m = match; *m != 0; m++)
      {
diff --git a/src/modules/everything/evry_plug_tracker.c b/src/modules/everything/evry_plug_tracker.c
index 973c3e1d2..43b4449ed 100644
--- a/src/modules/everything/evry_plug_tracker.c
+++ b/src/modules/everything/evry_plug_tracker.c
@@ -206,7 +206,7 @@ _dbus_cb_reply(void *data, DBusMessage *msg, DBusError *error)
      }
    else if (inst->items && inst->input)
      {
-	int len_matched = strlen(inst->matched);
+	int len_matched = (inst->matched ? strlen(inst->matched) : 0);
 	int len_input = strlen(inst->input);
 	Eina_List *l;