diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
index 135934e47..41db374dd 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
@@ -465,6 +465,7 @@ public class SnapShotGenerationTests {
     fp.setHostServices(context);
     messages = new ArrayList<ValidationMessage>();
 
+    System.out.println("---- "+id+" -----------------------------------------");
     if (test.isFail()) {
       boolean failed = true;
       try {
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
index a5476d661..30903ddcd 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
@@ -229,8 +229,14 @@ public class VersionUtilities {
    * @return Is {@literal current} later or equal to {@literal test}? For example, if <code>this = 0.5</code> and <code>current = 0.6</code> this method will return true
    */
   public static boolean isThisOrLater(String test, String current) {
+    if (test == null || current == null) {
+      return false;
+    }
     String t = getMajMin(test);
     String c = getMajMin(current);
+    if (t == null || c == null) {
+      return false;
+    }
     if (c.compareTo(t) == 0) {
       return isMajMinOrLaterPatch(test, current);
     }