diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
index 9c45752c3fd..a40266923fc 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
@@ -442,11 +442,7 @@ class ParserState<T> {
 					((IIdentifiableElement) myInstance).setElementSpecificId((theValue));
 				} else if (myInstance instanceof IBaseElement) {
 					((IBaseElement) myInstance).setId(theValue);
-				} else if (myInstance instanceof IBaseResource) {
-					new IdDt(theValue).applyTo((IBaseResource) myInstance);
 				}
-			} else if ("url".equals(theName) && myInstance instanceof ExtensionDt) {
-				((ExtensionDt) myInstance).setUrl(theValue);
 			} else {
 				if (myJsonMode) {
 					myErrorHandler.incorrectJsonType(null, myElementName, ValueType.OBJECT, null, ValueType.SCALAR, ScalarType.STRING);
@@ -1251,7 +1247,7 @@ class ParserState<T> {
 					myErrorHandler.unknownAttribute(null, theName);
 				}
 			} else {
-				myErrorHandler.unknownAttribute(null, theName);
+				super.attributeValue(theName, theValue);
 			}
 		}
 
@@ -1273,7 +1269,7 @@ class ParserState<T> {
 
 		@Override
 		public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
-			myErrorHandler.unknownElement(null, theLocalPart);
+			super.enteringNewElement(theNamespaceUri, theLocalPart);
 			push(new SwallowChildrenWholeState(getPreResourceState()));
 		}
 
diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java
index 7f6b0370b7a..bec503d05a8 100644
--- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java
+++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java
@@ -190,6 +190,24 @@ public class XmlParserDstu2Test {
 		parser.parseResource(ca.uhn.fhir.model.dstu2.resource.Bundle.class, string);
 	}
 
+	@Test
+	public void testIdOnComposite() {
+		String input = "<Patient xmlns=\"http://hl7.org/fhir\">\n" +
+			"   <name id=\"foo\">\n" +
+			"     <family value=\"hello\"/>" +
+			"   </name>" +
+			"   <active value=\"true\"/>" +
+			"</Patient>";
+
+		IParser p = ourCtx.newXmlParser();
+
+		Patient patient = p.parseResource(Patient.class, input);
+		assertTrue(patient.getActive());
+		assertEquals("foo", patient.getNameFirstRep().getElementSpecificId());
+
+	}
+
+
 	@Test
 	public void testSetDontEncodeResourcesWithMetaSubPath() {
 		Patient p = new Patient();
diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java
index 8f49131707a..b94659d8480 100644
--- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java
+++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java
@@ -187,6 +187,66 @@ public class XmlParserDstu3Test {
 
 	}
 
+	@Test
+	public void testUnknownAttributeInPrimitive() {
+
+		IParserErrorHandler errorHandler = mock(IParserErrorHandler.class);
+
+		String bundle = "<Bundle xmlns=\"http://hl7.org/fhir\">\n" +
+			"   <total value=\"1\" foo=\"bar\"/>\n" +
+			"</Bundle>";
+
+		Bundle b = ourCtx.newXmlParser().setParserErrorHandler(errorHandler).parseResource(Bundle.class, bundle);
+		assertEquals(1, b.getTotal());
+
+		ArgumentCaptor<String> attributeCaptor = ArgumentCaptor.forClass(String.class);
+		verify(errorHandler, times(1)).unknownAttribute(any(), attributeCaptor.capture());
+		assertEquals("foo", attributeCaptor.getValue());
+	}
+
+	@Test
+	public void testUnknownElementInPrimitive() {
+
+		IParserErrorHandler errorHandler = mock(IParserErrorHandler.class);
+
+		String bundle = "<Bundle xmlns=\"http://hl7.org/fhir\">\n" +
+			"   <total value=\"1\">\n" +
+			"      <foo/>" +
+			"   </total>\n" +
+			"</Bundle>";
+
+		Bundle b = ourCtx.newXmlParser().setParserErrorHandler(errorHandler).parseResource(Bundle.class, bundle);
+		assertEquals(1, b.getTotal());
+
+		ArgumentCaptor<String> attributeCaptor = ArgumentCaptor.forClass(String.class);
+		verify(errorHandler, times(1)).unknownElement(any(), attributeCaptor.capture());
+		assertEquals("foo", attributeCaptor.getValue());
+	}
+
+	@Test
+	public void testExtensionInInvalidSpot() {
+
+		IParserErrorHandler errorHandler = mock(IParserErrorHandler.class);
+
+		String bundle = "<Bundle xmlns=\"http://hl7.org/fhir\">\n" +
+			"   <extension url=\"http://foo\">" +
+			"      <valueString value=\"blah\"/>" +
+			"   </extension>" +
+			"   <modifierExtension url=\"http://foo\">" +
+			"      <valueString value=\"blah\"/>" +
+			"   </modifierExtension>" +
+			"   <total value=\"1\"/>\n" +
+			"</Bundle>";
+
+		Bundle b = ourCtx.newXmlParser().setParserErrorHandler(errorHandler).parseResource(Bundle.class, bundle);
+		assertEquals(1, b.getTotal());
+
+		ArgumentCaptor<String> attributeCaptor = ArgumentCaptor.forClass(String.class);
+		verify(errorHandler, times(2)).unknownElement(any(), attributeCaptor.capture());
+		assertEquals("extension", attributeCaptor.getAllValues().get(0));
+		assertEquals("modifierExtension", attributeCaptor.getAllValues().get(1));
+	}
+
 
 	@Test
 	public void testContainedResourceInExtensionUndeclared() {
@@ -219,6 +279,30 @@ public class XmlParserDstu3Test {
 		parser.parseResource(Bundle.class, string);
 	}
 
+	@Test
+	public void testContainedResourceWithNoId2() {
+		String input = "<Patient xmlns=\"http://hl7.org/fhir\">\n" +
+			"   <contained>\n" +
+			"      <Organization xmlns=\"http://hl7.org/fhir\">\n" +
+			"         <name value=\"Contained Test Organization\"/>\n" +
+			"      </Organization>\n" +
+			"   </contained>" +
+			"   <active value=\"true\"/>" +
+			"</Patient>";
+
+		IParserErrorHandler errorHandler = mock(IParserErrorHandler.class);
+
+		IParser p = ourCtx.newXmlParser();
+		p.setParserErrorHandler(errorHandler);
+
+		Patient patient = p.parseResource(Patient.class, input);
+		assertTrue(patient.getActive());
+
+		verify(errorHandler, times(1)).containedResourceWithNoId(nullable(IParseLocation.class));
+
+	}
+
+
 	@Test()
 	public void testContainedResourceWithNoIdLenient() throws IOException {
 		String string = IOUtils.toString(getClass().getResourceAsStream("/bundle_with_contained_with_no_id.xml"), StandardCharsets.UTF_8);