diff --git a/[refs] b/[refs]
index ab346163351b..cdb5399998b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c
+refs/heads/master: 814d68629b40e863997fa0eea459be4cc99a06cc
diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c
index b6183eda8106..10c9439635ca 100644
--- a/trunk/drivers/md/dm-table.c
+++ b/trunk/drivers/md/dm-table.c
@@ -590,6 +590,12 @@ int dm_split_args(int *argc, char ***argvp, char *input)
 	unsigned array_size = 0;
 
 	*argc = 0;
+
+	if (!input) {
+		*argvp = NULL;
+		return 0;
+	}
+
 	argv = realloc_argv(&array_size, argv);
 	if (!argv)
 		return -ENOMEM;