diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_1Test.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_1Test.java
index 9b945cbae4c680eb4a73737c38294d165d8ce38a..61a598b833b2e1d481a44af1af5ce7c714d24362 100644
--- a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_1Test.java
+++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_1Test.java
@@ -68,15 +68,14 @@ public final class DataStructureV1_1Test extends AbstractFileSystemTestCase
     public void testSetSample()
     {
         dataStructure.create();
-        boolean fail = true;
         try
         {
             dataStructure.setSample(SAMPLE);
-        } catch (final AssertionError ex)
+            fail();
+        } catch (final DataStructureException ex)
         {
-            fail = false;
+            // Nothing to do here.
         }
-        assertFalse(fail);
         dataStructure.setSample(new SampleWithOwner(SAMPLE,
                 SampleWithOwnerTest.INSTANCE_GLOBAL_CODE, SampleWithOwnerTest.INSTANCE_CODE, ""));
     }