diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java
index 71d22a073..3c4529739 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java
@@ -11,6 +11,9 @@ public class JurisdictionUtilities {
   }
 
   public static String getJurisdictionFromLocale(String s) {
+    if (s == null) {
+      return null;
+    }
     if (Utilities.existsInList(s.toUpperCase(), 
         "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ",
         "AR", "AS", "AT", "AU", "AW", "AX", "AZ", "BA", "BB",
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
index 570ea6b9e..9315748ef 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
@@ -5,6 +5,7 @@ import java.net.Authenticator;
 import java.net.PasswordAuthentication;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /*
   Copyright (c) 2011+, HL7, Inc.
@@ -255,7 +256,11 @@ public class ValidatorCli {
     if (cliContext.getSv() == null) {
       cliContext.setSv(validationService.determineVersion(cliContext));
     }
-    System.out.println("  Jurisdiction: "+JurisdictionUtilities.displayJurisdiction(cliContext.getJurisdiction()));
+    if (cliContext.getJurisdiction() == null) {
+      System.out.println("  Jurisdiction: None specified (locale = "+Locale.getDefault().getCountry()+")");      
+    } else {
+      System.out.println("  Jurisdiction: "+JurisdictionUtilities.displayJurisdiction(cliContext.getJurisdiction()));
+    }
 
     System.out.println("Loading");
     // Comment this out because definitions filename doesn't necessarily contain version (and many not even be 14 characters long).