diff --git a/runtime/starpu/control/runtime_tags.c b/runtime/starpu/control/runtime_tags.c
index 32c481a0d11a0970bd502bfc5800f0de4a6ead1d..3030d12c5a346dc9cdcebe5f95445b5fa6b2082e 100644
--- a/runtime/starpu/control/runtime_tags.c
+++ b/runtime/starpu/control/runtime_tags.c
@@ -165,6 +165,14 @@ chameleon_starpu_tag_release( int64_t min )
     cst_range_t *current = cst_first;
 
     assert( cst_first != NULL ); /* At least one range must be registered */
+    if ( current == NULL ) {
+#if defined(CHAMELEON_DEBUG_STARPU)
+        fprintf( stderr, "chameleon_starpu_tag: FAILED to release [%ld,...]\n",
+                 min );
+#endif
+
+        return;
+    }
 
     while ( (current != NULL) && (current->min < min) ) {
         prev    = current;