diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index ef327138405668a60d9249caf72885e53494f415..6873f90a54cb99f28340adf1d5d07497107e54b9 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -282,7 +282,7 @@ case "$command" in
     ;;
   verify-archives)
     shift
-    java -cp lib/* ch.systemsx.cisd.openbis.dss.archiveverifier.cli.Main etc/service.properties $*
+    java -cp "lib/*" ch.systemsx.cisd.openbis.dss.archiveverifier.cli.Main etc/service.properties $*
     ;;    
   log-thread-dump)
     if [ -f $PIDFILE ]; then
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java
index 00b49f0033d460e180b6e76f52db2379b457cae2..926840933b4e530122021637fa8251213eca5d3e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java
@@ -73,7 +73,7 @@ public class DataSetArchiveVerificationBatchFactory
         {
             if (args.length < 2)
             {
-                throw new ConfigurationException("Usage: datastore_server.sh verify-archives <dataset_code_1> <dataset code 2> ...");
+                throw new ConfigurationException("Usage: datastore_server.sh verify-archives <dataset_code_1> <dataset_code_2> ...");
             }
 
             Properties properties = readServiceProperties(args[0]);