diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c
index 3b117c505..d82fde0b7 100644
--- a/daemon/lvm-filter.c
+++ b/daemon/lvm-filter.c
@@ -264,8 +264,11 @@ make_filter_strings (char *const *devices)
   if (add_string (&ret, "r|.*|") == -1)
     goto error;
 
-  end_stringsbuf (&ret);
+  if (end_stringsbuf (&ret) == -1)
+    goto error;
+
   return ret.argv;
+
 error:
   if (ret.argv)
     free_stringslen (ret.argv, ret.size);