diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c
index 613f72dd37..147e09070b 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -896,7 +896,11 @@ ecore_evas_buffer_new(int w, int h)
      ecore_evas_buffer_allocfunc_new(w, h, _ecore_evas_buffer_pix_alloc,
                                      _ecore_evas_buffer_pix_free, NULL);
 
-   if (!ee) ecore_event_evas_shutdown();
+   if (!ee)
+     {
+        ecore_event_evas_shutdown();
+        return NULL;
+     }
 
    ecore_evas_done(ee, EINA_TRUE);