From df26951336b713dfb4d7996289bb43b87cadfae7 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Wed, 24 May 2023 16:57:22 +1000
Subject: [PATCH] fix npe

---
 .../fhir/r5/terminologies/validation/ValueSetValidator.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/validation/ValueSetValidator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/validation/ValueSetValidator.java
index 178ae1bf1..c9c9e5e70 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/validation/ValueSetValidator.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/validation/ValueSetValidator.java
@@ -223,9 +223,9 @@ public class ValueSetValidator {
       for (Coding c : code.getCoding()) {
         b.append(c.getSystem()+(c.hasVersion() ? "|"+c.getVersion() : "")+"#"+c.getCode());
         Boolean ok = codeInValueSet(c.getSystem(), c.getVersion(), c.getCode(), info);
-        if (ok == null && result == false) {
+        if (ok == null && result != null && result == false) {
           result = null;
-        } else if (ok) {
+        } else if (ok != null && ok) {
           result = true;
           foundCoding = c;
           if (options.getValueSetMode() == ValueSetMode.CHECK_MEMERSHIP_ONLY) {