diff --git a/tools/setup.py b/tools/setup.py
index 94b9e231..5256db46 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -122,7 +122,7 @@
     urlPrefix = ''
 
 # Accept CLI args, copy them
-if args.dbprefix:
+if args.dbprefix != None:
     urlPrefix = args.dbprefix
 if args.dbhost:
     hostname = args.dbhost
@@ -140,7 +140,7 @@
     wc = False
 if args.dbshards:
     shards = args.dbshards
-if args.dbreplicas:
+if args.dbreplicas != None:
     replicas = args.dbreplicas
 if args.generator:
     genname = args.generator