diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index 5829c86f8..2ac9a1ff4 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -254,6 +254,7 @@ e_app_is_parent(E_App *parent, E_App *app)
 int
 e_app_equals(E_App *app1, E_App *app2)
 {
+   if ((!app1) || (!app2)) return 0;
    return ((app1 == app2) || (app1->orig == app2) ||
 	   (app1 == app2->orig) || (app1->orig == app2->orig));
 }
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index d22fa6aed..5cd8eae99 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -7176,7 +7176,7 @@ _e_border_app_change(void *data, E_App *app, E_App_Change change)
 	E_Border *bd;
 
 	bd = l->data;
-	if ((bd->app) && (e_app_equals(bd->app, app)))
+	if (e_app_equals(bd->app, app))
 	  {
 	     bd->changes.icon = 1;
 	     bd->changed = 1;