diff --git a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
index b5979cbc388441e8b6d03afd179b71ef8011002a..2de6a27d1617c0c6cf6dbe0bb1dc52b3d697dd16 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
@@ -273,10 +273,6 @@ public class DataStructureV1_0 extends AbstractDataStructure
     public final void assertValid()
     {
         super.assertValid();
-        if (getOriginalData().iterator().hasNext() == false)
-        {
-            throw new DataStructureException("Empty original data directory.");
-        }
         IDirectory metaDataDirectory = getMetaDataDirectory();
         if (metaDataDirectory.tryGetNode(Format.FORMAT_DIR) == null && format == null)
         {
diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
index 1157c62a0552f148d8d05b2739a3d0e293a36fd5..f6dcfb905218b1214026dca715ad77c7a87beb96 100644
--- a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
+++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
@@ -61,9 +61,9 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase
 
     @Override
     @BeforeMethod
-    public final void setup() throws IOException
+    public final void setUp() throws IOException
     {
-        super.setup();
+        super.setUp();
         storage = new FileStorage(workingDirectory);
         dataStructure = new DataStructureV1_0(storage);
     }
@@ -241,20 +241,6 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase
         }
     }
 
-    @Test
-    public void testCloseForEmptyData()
-    {
-        dataStructure.create();
-        try
-        {
-            dataStructure.close();
-            fail("DataStructureException expected.");
-        } catch (DataStructureException e)
-        {
-            assertEquals("Empty original data directory.", e.getMessage());
-        }
-    }
-
     @Test
     public void testCloseIfNoFormat()
     {