1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java
index 2a8c3a0..3bbb77f 100644
--- a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java
+++ b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java
@@ -57,7 +57,16 @@ public class CastorXMLUtility
                 throw new InvalidDataException("Error loading map '"+thisMap+"'", "");
             }
         }
-        Logger.msg("Loaded all maps from "+mapURL.toString());
+        
+        // Test the maps now, instead of on first use.
+        
+        try {
+        	new Unmarshaller( mMapping );
+        } catch (MappingException e) {
+        	Logger.error(e);
+        	throw new InvalidDataException("Castor mapfiles are not valid", "");
+        }
+        Logger.msg(1, "Loaded all maps from "+mapURL.toString());
     }