diff --git a/maestro/cdo.c b/maestro/cdo.c
index cb413bb27e1939918c73979f95df7dba0bee3742..dcc5a2c885223211fde3b3cc65d2b8de717016fb 100644
--- a/maestro/cdo.c
+++ b/maestro/cdo.c
@@ -528,10 +528,6 @@ mstro_cdo_declare_propagate(const char *name,
     }
   }
 
- /* mamba array and raw pointer */
-  (*result)->mamba_array = NULL;
-  (*result)->raw_ptr = NULL;
-
   return MSTRO_OK;
 }
 
@@ -571,6 +567,10 @@ mstro_cdo_declare_core(const char *name,
   if (s != MSTRO_OK)
     return s;
 
+ /* mamba array and raw pointer */
+  (*result)->mamba_array = NULL;
+  (*result)->raw_ptr = NULL;
+
   /* Ensuire default attributes */
   s = mstro_cdo_attribute_set_default(*result);
   if (s != MSTRO_OK)