diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index 7c3b75cac4..394de7b78b 100644
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -2198,7 +2198,7 @@ err:
 	free(paths);
 	(void) close(base);
 #endif
-	return (-1);
+	return (0);
 }
 
 typedef struct zvol_cb {
diff --git a/scripts/zpool-create.sh b/scripts/zpool-create.sh
index e46b02cdda..4b8e3a8bf2 100755
--- a/scripts/zpool-create.sh
+++ b/scripts/zpool-create.sh
@@ -62,6 +62,10 @@ while getopts 'hvc:p:' OPTION; do
 	esac
 done
 
+if [ $(id -u) != 0 ]; then
+        die "Must run as root"
+fi
+
 check_config || die "${ERROR}"
 . ${ZPOOL_CONFIG}