diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java
index aeb2f70497b751525bcb65cd33ca8989c25daeba..e291b4e5bf20856106db4795af86d1b8f52abd8f 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java
@@ -152,8 +152,12 @@ public class ConfigReader
         {
             throw new ConfigurationFailureException("Section '" + section + " does not exist.");
         }
-        String val = map.get(key).trim();
-        if (val.equals("") == true)
+        String val = map.get(key);
+        if (val == null)
+        {
+            return null;
+        }
+        if (val.trim().equals("") == true)
         {
             return null;
         }