diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 51250156f..de19d406f 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -2563,6 +2563,9 @@ _e_fm2_client_mount(const char *udi, const char *mountpoint)
    char *d;
    int l, l1, l2;
 
+   if (!udi || !mountpoint)
+     return 0;
+
    l1 = strlen(udi);
    l2 = strlen(mountpoint);
    l = l1 + 1 + l2 + 1;
@@ -2579,6 +2582,9 @@ _e_fm2_client_unmount(const char *udi)
    char *d;
    int l, l1;
 
+   if (!udi)
+     return 0;
+
    l1 = strlen(udi);
    l = l1 + 1;
    d = alloca(l);
@@ -2595,6 +2601,9 @@ _e_fm2_client_eject(const char *udi)
    char *data;
    int size;
 
+   if (!udi)
+     return 0;
+
    size = strlen(udi) + 1;
    data = alloca(size);
    strcpy(data, udi);
diff --git a/src/bin/e_fm_dbus.c b/src/bin/e_fm_dbus.c
index 517092f01..4bb692195 100644
--- a/src/bin/e_fm_dbus.c
+++ b/src/bin/e_fm_dbus.c
@@ -463,6 +463,7 @@ e_fm2_dbus_mount_find(const char *path)
    EINA_LIST_FOREACH(_e_vols, l, v)
      {
 	if (v->mounted
+	    && v->mount_point
 	    && !strncmp(path, v->mount_point, strlen(v->mount_point))
 	    && v->mounts) 
 	  return eina_list_data_get(v->mounts);