diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
index b56dda84868bce8eb24edadb13a1fb539fd690d6..e77c5505c605b4afaf1b5d83d0471fed9236d500 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -77,7 +77,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
     if(request.getUntil() != null && !OAIPMHUtilities.isThisDateValid(request.getUntil())) {
     	errorValues.add("until");
     }
-    if(OAIPMHUtilities.getFormatOfDate(request.getFrom()).equals(OAIPMHUtilities.getFormatOfDate(request.getFrom()))) {
+    if(request.getFrom()!= null && request.getUntil()!=null && OAIPMHUtilities.getFormatOfDate(request.getFrom()).equals(OAIPMHUtilities.getFormatOfDate(request.getFrom()))) {
     	errorValues.add("The granularities for from and until doesn't match");
     }
     if (errorValues.size() > 0) {
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
index 010266b545b840223f5532f814291883c8a4f0f8..5d8160f0b447a7bf60f3faad6e4365cecfd1077a 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -424,7 +424,7 @@ public class OaiPmhTest {
     OaiPmhTest.recordList.setModifiedField(TGConstants.CREATED);
     OaiPmhTest.recordList.setIdentifierField(TGConstants.URI);
     OaiPmhTest.recordList.setSearchResponseSize("100");
-    String r = this.request.getRequest("ListRecords", "", "oai_dc", "", "2002-02-06T05:35:00Z", "", "");
+    String r = this.request.getRequest("ListRecords", "", "oai_dc", "", "", "", "");
     System.out.println(r);
     System.out.println("-----------------------------------\n");
   }