diff --git a/[refs] b/[refs]
index 8a3f82ee20f1..ef5805a69d64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6076905b5ef39e0ea58db32583c9e0036c05e47b
+refs/heads/master: 613978f8711c7fd4d0aa856872375d2abd7c92ff
diff --git a/trunk/drivers/md/dm-exception-store.c b/trunk/drivers/md/dm-exception-store.c
index 7dbe652efb5a..205215968ff1 100644
--- a/trunk/drivers/md/dm-exception-store.c
+++ b/trunk/drivers/md/dm-exception-store.c
@@ -216,7 +216,8 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
 		type = get_type("N");
 	else {
 		ti->error = "Persistent flag is not P or N";
-		return -EINVAL;
+		r = -EINVAL;
+		goto bad_type;
 	}
 
 	if (!type) {