diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 86bb0698c3..ee93852116 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -796,3 +796,7 @@
 2012-12-08  ChunEon Park (Hermet)
 
 	* Fix the naviframe title_set problem that caused the title visible status reset.
+
+2012-12-10  Cedric Bail
+
+	* Make sure private data is not NULL in elm_interface_scrollable.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 34ffd14cf4..fc2838c438 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -86,6 +86,7 @@ Fixes:
    * Safer call to mkstemp in elm_cnp.
    * Simplify test in elm_entry_text_set.
    * Fix focus problem in multibuttonentry. Entry can get focus only when multibuttonentry is focused.
+   * Make sure private data is not NULL in elm_interface_scrollable.
 
 Removals:
 
diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.c b/legacy/elementary/src/lib/elm_interface_scrollable.c
index 440e84d7f2..5a4617fb2d 100644
--- a/legacy/elementary/src/lib/elm_interface_scrollable.c
+++ b/legacy/elementary/src/lib/elm_interface_scrollable.c
@@ -8,25 +8,22 @@ EAPI Eo_Op ELM_OBJ_PAN_BASE_ID = EO_NOOP;
 
 #define MY_PAN_CLASS_NAME "elm_pan"
 
-#define ELM_PAN_DATA_GET(o, sd) \
-  Elm_Pan_Smart_Data * sd = eo_data_get(o, MY_PAN_CLASS)
-
-#define ELM_PAN_DATA_GET_OR_RETURN(o, ptr)          \
-  ELM_PAN_DATA_GET(o, ptr);                         \
-  if (!ptr)                                         \
-    {                                               \
-       CRITICAL("No smart data for object %p (%s)", \
-                o, evas_object_type_get(o));        \
-       return;                                      \
+#define ELM_PAN_DATA_GET_OR_RETURN(o, ptr)			\
+  Elm_Pan_Smart_Data *ptr = eo_data_get(o, MY_PAN_CLASS);	\
+  if (!ptr)							\
+    {								\
+       CRITICAL("No smart data for object %p (%s)",		\
+                o, evas_object_type_get(o));			\
+       return;							\
     }
 
-#define ELM_PAN_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
-  ELM_PAN_DATA_GET(o, ptr);                         \
-  if (!ptr)                                         \
-    {                                               \
-       CRITICAL("No smart data for object %p (%s)", \
-                o, evas_object_type_get(o));        \
-       return val;                                  \
+#define ELM_PAN_DATA_GET_OR_RETURN_VAL(o, ptr, val)		\
+  Elm_Pan_Smart_Data *ptr = eo_data_get(o, MY_PAN_CLASS);	\
+  if (!ptr)							\
+    {								\
+       CRITICAL("No smart data for object %p (%s)",		\
+                o, evas_object_type_get(o));			\
+       return val;						\
     }
 
 static const char SIG_CHANGED[] = "changed";
@@ -286,7 +283,7 @@ _elm_pan_content_set(Evas_Object *obj,
 {
    Evas_Coord w, h;
 
-   ELM_PAN_DATA_GET(obj, psd);
+   ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
 
    if (content == psd->content) return;
    if (psd->content)