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 e71d1f7f7897a2381baa6a3e2348e104f177d9c8..5023956f7be5d05f7b12b34f7a6ffca7a3734bd0 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
@@ -27,6 +27,7 @@ import ch.systemsx.cisd.bds.storage.ILink;
 import ch.systemsx.cisd.bds.storage.INode;
 import ch.systemsx.cisd.bds.storage.StorageException;
 import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
+import ch.systemsx.cisd.common.exceptions.NotImplementedException;
 import ch.systemsx.cisd.common.utilities.FileUtilities;
 
 /**
@@ -123,8 +124,7 @@ final class Directory extends AbstractNode implements IDirectory
 
     public final ILink addLink(final String name, final INode node)
     {
-        // TODO Auto-generated method stub
-        return null;
+        throw new NotImplementedException();
     }
 
     public final Iterator<INode> iterator()
diff --git a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Link.java b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Link.java
index ee49db08b15525f7f837df72759e2acaee83faf9..28565473b9a3c3c4e7fd853e44580a804ea957ac 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Link.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/Link.java
@@ -21,6 +21,7 @@ import java.io.File;
 import ch.systemsx.cisd.bds.storage.IDirectory;
 import ch.systemsx.cisd.bds.storage.ILink;
 import ch.systemsx.cisd.bds.storage.INode;
+import ch.systemsx.cisd.common.exceptions.NotImplementedException;
 
 /**
  * @author Franz-Josef Elmer
@@ -62,12 +63,11 @@ class Link implements ILink
 
     public void extractTo(final File directory)
     {
-        // TODO Auto-generated method stub
+        throw new NotImplementedException();
     }
 
     public void moveTo(File directory)
     {
-        // TODO Auto-generated method stub
+        throw new NotImplementedException();
     }
-        
 }
diff --git a/bds/source/java/ch/systemsx/cisd/bds/storage/hdf5/HDF5Storage.java b/bds/source/java/ch/systemsx/cisd/bds/storage/hdf5/HDF5Storage.java
index 78b523a53279e2abe39014828a5be3b5a3e38a8c..6a2a29b8444cbea98312eacea43d80679ab89c2c 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/storage/hdf5/HDF5Storage.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/storage/hdf5/HDF5Storage.java
@@ -20,6 +20,7 @@ import java.io.File;
 
 import ch.systemsx.cisd.bds.storage.IDirectory;
 import ch.systemsx.cisd.bds.storage.IStorage;
+import ch.systemsx.cisd.common.exceptions.NotImplementedException;
 
 /**
  * Storage based on HDF5.
@@ -35,20 +36,17 @@ public class HDF5Storage implements IStorage
     
     public IDirectory getRoot()
     {
-        // TODO Auto-generated method stub
-        return null;
+        throw new NotImplementedException();
     }
 
     public void mount()
     {
-        // TODO Auto-generated method stub
-
+        throw new NotImplementedException();
     }
 
     public void unmount()
     {
-        // TODO Auto-generated method stub
-
+        throw new NotImplementedException();
     }
 
 }