diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 43a64de843..3949decdab 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -800,3 +800,8 @@
 2012-06-12  ChunEon Park (Hermet)
 
  	* Removed empty evas_object_map_source_set/get APIs. Will Not be implemented.
+
+2012-06-13  Mike Blumenkrantz
+
+        * Fix crash in evas_object_image_add() when called prior to setting an engine
+          for the given canvas.
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index 14bde10d38..aa7efd8388 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -177,6 +177,7 @@ evas_object_image_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
+   EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL);
    obj = evas_object_new(e);
    evas_object_image_init(obj);
    evas_object_inject(obj, e);