diff --git a/server/reagent.py b/server/reagent.py
index be09f3803..55917c1e2 100644
--- a/server/reagent.py
+++ b/server/reagent.py
@@ -77,11 +77,11 @@ help_opts = [
         (2, 'remove', 4, _('remove the provided atoms from the current repository database')),
             (3, '--nodeps', 2, _('do not include reverse dependencies')),
         (2, 'multiremove', 3, _('remove the provided injected atoms (all if no atom specified)')),
-        (2, 'create-empty-database', 2, _('create an empty repository database in the provided path')),
+        (2, 'create-empty-database <path>', 1, _('create an empty repository database in the provided path')),
         (2, 'switchbranch <from branch> <to branch>', 3, _('switch to the specified branch the repository')),
         (2, 'md5remote [atoms]', 2, _('verify remote integrity of the provided atoms')),
         (2, 'backup', 4, _('backup current repository database')),
-        (2, 'restore', 3, _('restore a previously backed-up repository database')),
+        (2, 'restore', 4, _('restore a previously backed-up repository database')),
         (2, 'enable <repo>', 3, _('enable the specified repository')),
         (2, 'disable <repo>', 3, _('disable the specified repository')),
         (2, 'package-dep-check <repo> [atoms]', 0, _('check packages in repository for missing dependencies')),
diff --git a/server/server_reagent.py b/server/server_reagent.py
index b0c86901c..8893e8d21 100644
--- a/server/server_reagent.py
+++ b/server/server_reagent.py
@@ -730,6 +730,8 @@ def _repositories(entropy_server, options):
         dbpath = None
         if myopts:
             dbpath = myopts[0]
+        if dbpath is None:
+            return -10
         print_info(darkgreen(" * ")+red("%s: " % (
             _("Creating empty database to"),) ) + dbpath)
         if os.path.isfile(dbpath):