From 655c072d64c71293b74207319ec7614594bf3266 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Wed, 9 Dec 2020 10:09:02 +1100
Subject: [PATCH] fix for NPE rendering references to contained value setes in
 Questionnaires that don't resolve

---
 .../java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java
index ead0cf012..5e0dba77e 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java
@@ -709,8 +709,9 @@ public class QuestionnaireRenderer extends TerminologyRenderer {
     if (i.hasAnswerValueSet()) {
       ValueSet vs = null;
       if (i.getAnswerValueSet().startsWith("#")) {
-        vs = (ValueSet) q.getContained(i.getAnswerValueSet().substring(1)).copy();
+        vs = (ValueSet) q.getContained(i.getAnswerValueSet().substring(1));
         if (vs != null && !vs.hasUrl()) {
+          vs = vs.copy();
           vs.setUrl("urn:uuid:"+UUID.randomUUID().toString().toLowerCase());
         }
       } else {