diff --git a/lib/timidity/timidity/timidity.c b/lib/timidity/timidity/timidity.c
index 958296a464113..e5383138f2e55 100644
--- a/lib/timidity/timidity/timidity.c
+++ b/lib/timidity/timidity/timidity.c
@@ -974,8 +974,14 @@ static int set_gus_patchconf(char *name, int line,
     {
 	int err;
 	if((err = set_gus_patchconf_opts(name, line, opts[j], tone)) != 0)
+    {
+#ifdef SET_GUS_PATCHCONF_COMMENT
+        if(old_name != NULL)
+            free(old_name);
+#endif
 	    return err;
     }
+    }
 #ifdef SET_GUS_PATCHCONF_COMMENT
 		if(tone->comment == NULL ||
 			(old_name != NULL && strcmp(old_name,tone->comment) == 0))