diff --git a/hl7templates/hl7templates-model-jar/src/main/java/net/ihe/gazelle/tempmodel/decor/dt/utils/DTUtils.java b/hl7templates/hl7templates-model-jar/src/main/java/net/ihe/gazelle/tempmodel/decor/dt/utils/DTUtils.java
index 628943e85009e9305d0946f019d7ee1ceebd0df5..8fbc7ad8b345b0f9ea2e0d9364a00fd35d5ce79a 100644
--- a/hl7templates/hl7templates-model-jar/src/main/java/net/ihe/gazelle/tempmodel/decor/dt/utils/DTUtils.java
+++ b/hl7templates/hl7templates-model-jar/src/main/java/net/ihe/gazelle/tempmodel/decor/dt/utils/DTUtils.java
@@ -55,7 +55,7 @@ public final class DTUtils {
 		if (dt == null) {
 			return false;
 		}
-		String replacedDt = dt.replace(".", "_");;
+		String replacedDt = dt.replace(".", "_");
 		String realDT = listDTString.contains(replacedDt) ? replacedDt:dt.split("\\.")[0];
 		return listDTString.contains(realDT);
 	}
@@ -70,7 +70,8 @@ public final class DTUtils {
 
 		String realDt =  getRealDatatype(dataType);
 		if(realDt == null){
-			throw new IllegalArgumentException("Datatype "+dataType+" not found in datatypes.xml");
+			log.error("Datatype not found in datatypes.xml: {} " , dataType);
+			return null;
 		}
 		return  realDt
 				.replace("_", "")