diff --git a/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlBinaryResourceImpl.java b/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlBinaryResourceImpl.java
index 7044a18e3..1f7600394 100644
--- a/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlBinaryResourceImpl.java
+++ b/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlBinaryResourceImpl.java
@@ -74,13 +74,9 @@ public EMtlBinaryResourceImpl(URI uri) {
 	 * 
 	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doLoad(java.io.InputStream, java.util.Map)
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void doLoad(InputStream inputStream, Map<?, ?> options) throws IOException {
-		Map<Object, Object> actualOptions = (Map<Object, Object>)options;
-		if (actualOptions == null) {
-			actualOptions = new HashMap<Object, Object>();
-		}
+		Map<Object, Object> actualOptions = new HashMap<Object, Object>(options);
 		super.doLoad(inputStream, actualOptions);
 
 		if (!trimPosition) {
diff --git a/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlResourceImpl.java b/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlResourceImpl.java
index cadd826de..7367e501c 100644
--- a/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlResourceImpl.java
+++ b/plugins/org.eclipse.acceleo.model/src/org/eclipse/acceleo/model/mtl/resource/EMtlResourceImpl.java
@@ -74,13 +74,9 @@ public EMtlResourceImpl(URI uri) {
 	 * 
 	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doLoad(java.io.InputStream, java.util.Map)
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void doLoad(InputStream inputStream, Map<?, ?> options) throws IOException {
-		Map<Object, Object> actualOptions = (Map<Object, Object>)options;
-		if (actualOptions == null) {
-			actualOptions = new HashMap<Object, Object>();
-		}
+		Map<Object, Object> actualOptions = new HashMap<Object, Object>(options);
 		// Record unknown features so that we can load emtl files compiled under 3.1 with 3.0
 		actualOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
 		actualOptions.put(XMLResource.OPTION_URI_HANDLER, new AcceleoXMIURIHandler());