diff --git a/jhove-ext-modules/src/main/java/org/ithaka/portico/jhove/module/epub/JhoveRepInfoReport.java b/jhove-ext-modules/src/main/java/org/ithaka/portico/jhove/module/epub/JhoveRepInfoReport.java
index 5fa0e80de..e3d5eab2e 100644
--- a/jhove-ext-modules/src/main/java/org/ithaka/portico/jhove/module/epub/JhoveRepInfoReport.java
+++ b/jhove-ext-modules/src/main/java/org/ithaka/portico/jhove/module/epub/JhoveRepInfoReport.java
@@ -421,6 +421,7 @@ private static Date toDate(String isoDate) {
         if (isoDate == null || isoDate.length() == 0) {
             return null;
         }
+    	isoDate = isoDate.trim();
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(ISO_DATE_PATTERN);
         Date date;
diff --git a/jhove-ext-modules/src/main/resources/edu/harvard/hul/ois/jhove/module/epub/ErrorMessages.properties b/jhove-ext-modules/src/main/resources/org/ithaka/portico/jhove/module/epub/ErrorMessages.properties
similarity index 99%
rename from jhove-ext-modules/src/main/resources/edu/harvard/hul/ois/jhove/module/epub/ErrorMessages.properties
rename to jhove-ext-modules/src/main/resources/org/ithaka/portico/jhove/module/epub/ErrorMessages.properties
index 7551a314e..4c05dfd38 100644
--- a/jhove-ext-modules/src/main/resources/edu/harvard/hul/ois/jhove/module/epub/ErrorMessages.properties
+++ b/jhove-ext-modules/src/main/resources/org/ithaka/portico/jhove/module/epub/ErrorMessages.properties
@@ -1,3 +1,3 @@
-EPUB-PTC-1 = FATAL, [An error occurred.]
-EPUB-PTC-1-SUB = Exception: %s
+EPUB-PTC-1 = FATAL, [An error occurred.]
+EPUB-PTC-1-SUB = Exception: %s
 EPUB-PTC-2 = FATAL, [An undefined error occurred. This may be caused by a system error or indicative of a problem with the file provided.]
\ No newline at end of file