diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java
index b091a595114..2825d541df6 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java
@@ -25,7 +25,7 @@ public final class Msg {
 
 	/**
 	 * IMPORTANT: Please update the following comment after you add a new code
-	 * Last code value: 2114
+	 * Last code value: 2115
 	 */
 
 	private Msg() {}
diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java
index 9eb85dfa1a0..2bdad4253ee 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java
+++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java
@@ -525,7 +525,7 @@ public abstract class BaseCommand implements Comparable<BaseCommand> {
 			return Optional.of(new TlsAuthentication(keyStoreInfo, trustStoreInfo));
 		}
 		catch(Exception e){
-			throw new RuntimeException(e);
+			throw new RuntimeException(Msg.code(2115)+"Could not create TLS configuration options", e);
 		}
 	}