diff --git a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Directory.java b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Directory.java
index 50fb5acf7fc8bb75097dacae4cf772720ec9d370..0aaaa43ac503653f76e71a463b1a131ee3d2d79b 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Directory.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Directory.java
@@ -108,7 +108,10 @@ final class Directory extends AbstractNode implements IDirectory
     public final IFile addKeyValuePair(final String key, final String value)
     {
         assert key != null : "Given key can not be null.";
-        assert value != null : "Given value can not be null.";
+        if (value == null)
+        {
+            throw new IllegalArgumentException("Value for key '" + key + "' not specified.");
+        }
         java.io.File file = new java.io.File(nodeFile, key);
         FileUtilities.writeToFile(file, value);
         return new File(file);