diff --git a/src/lib/condition.c b/src/lib/condition.c
index c5bd19a6c..0d731f959 100644
--- a/src/lib/condition.c
+++ b/src/lib/condition.c
@@ -41,10 +41,8 @@ cinelerra_condition_destroy (CinelerraCondition self)
         CINELERRA_DIE;
       else if (pthread_cond_destroy (&self->cond))
         CINELERRA_DIE;
-      else
-        return self;
     }
-  return NULL;
+  return self;
 }
 
 
diff --git a/src/lib/condition.h b/src/lib/condition.h
index 7efad439c..e55c8ed0b 100644
--- a/src/lib/condition.h
+++ b/src/lib/condition.h
@@ -48,9 +48,9 @@ cinelerra_condition_init (CinelerraCondition self);
 
 
 /**
- * destroy a condition variable
- * @param self is a pointer to the condition variable to be initialized
- * @return self on success or NULL at error
+ * Destroy a condition variable
+ * @param self is a pointer to the condition variable to be destroyed
+ * @return self as given
  */
 CinelerraCondition
 cinelerra_condition_destroy (CinelerraCondition self);