diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
index 69eecde..09961bf 100644
--- a/libmultipath/devmapper.c
+++ b/libmultipath/devmapper.c
@@ -228,11 +228,15 @@ dm_get_uuid(char *name, char *uuid)
 	if (!dmt)
 		return 1;
 
-        if (!dm_task_set_name (dmt, name))
-                goto uuidout;
+        if (!dm_task_set_name (dmt, name)) {
+		dm_task_destroy(dmt);
+		return 1;
+	}
 
-	if (!dm_task_run(dmt))
-                goto uuidout;
+	if (!dm_task_run(dmt)) {
+		dm_task_destroy(dmt);
+		return 1;
+	}
 
 	uuidtmp = dm_task_get_uuid(dmt);
 	if (uuidtmp) {
@@ -244,7 +248,6 @@ dm_get_uuid(char *name, char *uuid)
 	else
 		uuid[0] = '\0';
 
-uuidout:
 	dm_task_destroy(dmt);
 
 	return 0;