diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java
index 450c4ea160f..fad7b4d8a85 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java
@@ -240,17 +240,17 @@ public class TerminologyLoaderSvcLoincTest {
 		// RSNA Playbook - LOINC Term -> RadLex RPID Mappings
 		conceptMap = conceptMaps.get(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_ID);
 		assertEquals(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_URI, conceptMap.getUrl());
-		assertEquals(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_URI, conceptMap.getName());
+		assertEquals(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_NAME, conceptMap.getName());
 		assertEquals(1, conceptMap.getGroup().size());
 		group = conceptMap.getGroupFirstRep();
 		// all entries have the same source and target so these should be null
 		assertEquals(IHapiTerminologyLoaderSvc.LOINC_URI, group.getSource());
 		assertEquals(LoincRsnaPlaybookHandler.RPID_CS_URI, group.getTarget());
-		assertEquals("24531-6", group.getElement().get(0).getCode());
-		assertEquals("US Retroperitoneum", group.getElement().get(0).getDisplay());
+		assertEquals("LP199995-4", group.getElement().get(0).getCode());
+		assertEquals("Neck", group.getElement().get(0).getDisplay());
 		assertEquals(1, group.getElement().get(0).getTarget().size());
-		assertEquals("RPID2142", group.getElement().get(0).getTarget().get(0).getCode());
-		assertEquals("US Retroperitoneum", group.getElement().get(0).getTarget().get(0).getDisplay());
+		assertEquals("RID7488", group.getElement().get(0).getTarget().get(0).getCode());
+		assertEquals("neck", group.getElement().get(0).getTarget().get(0).getDisplay());
 		assertEquals(Enumerations.ConceptMapEquivalence.EQUAL, group.getElement().get(0).getTarget().get(0).getEquivalence());
 
 		// TOP 2000 - US
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5bbc4f7c607..89cbf3ff060 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -119,6 +119,10 @@
 				could cause an error about the incorrect FHIR version. Thanks to 
 				Rob Hausam for the pull request!
 			</action>
+			<action type="fix">
+				A crash was fixed when deleting a ConceptMap resource in the
+				JPA server. This crash was a regression in HAPI FHIR 3.4.0.
+			</action>
 		</release>
 		<release version="3.4.0" date="2018-05-28">
 			<action type="add">