diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 549c609ecf392fc5bb199a27fecfc85a7f5f1b54..53f241f899d219846396b802e54a27df9eeeb749 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -195,6 +195,7 @@ void INSERT_TASK_zgemm_Astat( const RUNTIME_option_t *options,
     }
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
@@ -271,9 +272,11 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
     accessC = ( beta == 0. ) ? STARPU_W : (STARPU_RW | ((beta == 1.) ? STARPU_COMMUTE : 0));
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
-        chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
+        chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name,
+                            clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
         cl_name = cl_fullname;
     }
 #endif
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index de82bcce360c5d20759b66ff53316b54e361a496..52b923f98b8438431a8091adaee3294105158b29 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -186,6 +186,7 @@ void INSERT_TASK_zhemm_Astat( const RUNTIME_option_t *options,
     }
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
@@ -261,6 +262,7 @@ void INSERT_TASK_zhemm( const RUNTIME_option_t *options,
     accessC = ( beta == 0. ) ? STARPU_W : (STARPU_RW | ((beta == 1.) ? STARPU_COMMUTE : 0));
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 29301b83097c8b61383c00861777c35917ac27cd..19bf62ba2146006361df47daef4c2f95e8e84850 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -151,6 +151,7 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
     accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileC->name );
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 3000eb17d8f5795faa57ba48eef9c01a6c32a58b..0012ed7d1b67b339419ae437f5fd464e79d3a29e 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -187,6 +187,7 @@ void INSERT_TASK_zsymm_Astat( const RUNTIME_option_t *options,
     }
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
@@ -262,6 +263,7 @@ void INSERT_TASK_zsymm( const RUNTIME_option_t *options,
     accessC = ( beta == 0. ) ? STARPU_W : (STARPU_RW | ((beta == 1.) ? STARPU_COMMUTE : 0));
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 4df1a23030b6fc74f5816197878a5854c07be3c0..863e28648b0745d347801078f2417a787ba7df6a 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -152,6 +152,7 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
     accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileC->name );
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index ec98d97574cb16d54704264a14d9120e5571a979..c9f4ea32b5fb2fc4c22811247a3b9907182523e1 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -142,6 +142,7 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
     callback = options->profiling ? cl_ztrmm_callback : NULL;
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name );
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index d4c063b0d3069276c251e0f47f33556c0cb11ab2..1ce23594d3f7928c03ba049e9ee043abee4c7c5a 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -147,6 +147,7 @@ void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
     callback = options->profiling ? cl_ztrsm_callback : NULL;
 
 #if defined(CHAMELEON_KERNELS_TRACE)
+    if ( clargs != NULL )
     {
         char *cl_fullname;
         chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name );