diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
index cb165e8bc8aea7c870284d454a4cca15f6d6b95d..562bb8ee0e5232699138acfde8f6ef146d737896 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
@@ -202,6 +202,8 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
           System.out.println("  ##  dOOCD  -->  " + dateOfObjectCreationEntries);
 
           if (dateOfObjectCreationEntries.length != 2) {
+            // FIXME Go to ERROR state!
+          } else {
             String prefix = dateOfObjectCreationEntries[0];
             String suffix = dateOfObjectCreationEntries[1];
 
@@ -214,9 +216,6 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
 
               // this.datestamp =
             }
-
-          } else {
-            // FIXME Go to ERROR state!
           }
 
         } else {