diff --git a/ChangeLog b/ChangeLog
index 674f65df8b..a7c165df47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-13  ChunEon Park
+
+        * Evas: Don't be crashed even if the map image size is 0.
+
 2013-04-13  Jihoon Kim
 
         * Ecore_IMF: Add ecore_imf_input_panel_hide () API
diff --git a/NEWS b/NEWS
index f49c5a2faf..f5f3ce4233 100644
--- a/NEWS
+++ b/NEWS
@@ -237,3 +237,4 @@ Fixes:
     * Evas font: Fix a bug with cluster size calculation with texts ending
 	with ligatures.
     * Edje entry: When cursor is located to each edge, entry now doesn't grab events for cursor movement.
+	 * Evas map: don't be crashed even if image size is 0.
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 5985a73d5a..66c691ae3d 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -1332,9 +1332,9 @@ evas_object_map_update(Evas_Object *eo_obj,
         pt->fx = p->px;
         pt->fy = p->py;
         pt->fz = p->z;
-        if (uvw == 0) pt->u = 0;
+        if ((uvw == 0) || (imagew == 0)) pt->u = 0;
         else pt->u = ((lround(p->u) * imagew) / uvw) * FP1;
-        if (uvh == 0) pt->v = 0;
+        if ((uvh == 0) || (imageh == 0)) pt->v = 0;
         else pt->v = ((lround(p->v) * imageh) / uvh) * FP1;
         if      (pt->u < 0) pt->u = 0;
         else if (pt->u > (imagew * FP1)) pt->u = (imagew * FP1);