diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index f82caf74b..ac97ebcec 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -206,6 +206,7 @@ e_remember_default_match(E_Border *bd)
 EAPI void
 e_remember_update(E_Remember *rem, E_Border *bd)
 {
+   if (!rem) return;
    if (bd->new_client) return;
    if (rem->name) evas_stringshare_del(rem->name);
    if (rem->class) evas_stringshare_del(rem->class);
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 6e182ae2a..238ffcdd8 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -440,8 +440,8 @@ e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count)
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
    
-   *x_count = zone->desk_x_count;
-   *y_count = zone->desk_y_count;
+   if (x_count) *x_count = zone->desk_x_count;
+   if (y_count) *y_count = zone->desk_y_count;
 }
 
 EAPI void