diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
index 3aa9afa372678425258105437077e40ca3a2f6fe..d3335a9ebdcd20f77ccfe66e67046a94cd8c5017 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
@@ -69,7 +69,7 @@ public class DataStoreServer
 
     public static void main(String[] args)
     {
-        if (args[0].equals("--version"))
+        if (args.length > 0 && args[0].equals("--version"))
         {
             System.err
             .println("Data Store Server version " + BuildAndEnvironmentInfo.INSTANCE.getFullVersion());