1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java
index 4839fa3..6a9350f 100644
--- a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java
+++ b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java
@@ -57,6 +57,15 @@ public class CastorXMLUtility
                 throw new InvalidDataException("Error loading map '"+thisMap+"'", "");
             }
         }
+        
+        // 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());
     }