diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
index 2c6a90f1537..3555e6e816b 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
@@ -48,6 +48,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.apache.commons.io.IOUtils;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
@@ -197,7 +198,11 @@ class ModelScanner {
 
 		// FIXME: remove
 		if (myVersionTypes.contains(CodeDt.class) == false) {
-			throw new ConfigurationException("Did not request CodeDt: " + myVersionTypes);
+			try {
+				throw new ConfigurationException("Did not request CodeDt1: " + myVersionTypes + "\ndatatypes: " + theDatatypes + "\n\n" + IOUtils.toString(myVersion.getVersionImplementation().getFhirVersionPropertiesFile()));
+			} catch (IOException e) {
+				throw new ConfigurationException("FAILED: " + e.toString());
+			}
 		}
 		
 		// toScan.add(DateDt.class);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java
index a6133c704ef..363f9d66c14 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java
@@ -157,7 +157,7 @@ public class RuntimeChildUndeclaredExtensionDefinition extends BaseRuntimeChildD
 
 		// FIXME: remove
 		if (theClassToElementDefinitions.containsKey(CodeDt.class) == false) {
-			throw new ConfigurationException("Did not request CodeDt: " + (theClassToElementDefinitions.keySet()));
+			throw new ConfigurationException("Did not request CodeDt2: " + (theClassToElementDefinitions.keySet()));
 		}
 
 //		for (theContext.get)