diff --git a/src/main/java/com/structurizr/cli/HelpCommand.java b/src/main/java/com/structurizr/cli/HelpCommand.java
index a9a6065..1b07e66 100644
--- a/src/main/java/com/structurizr/cli/HelpCommand.java
+++ b/src/main/java/com/structurizr/cli/HelpCommand.java
@@ -11,7 +11,7 @@ class HelpCommand extends AbstractCommand {
     }
 
     public void run(String... args) throws Exception {
-        log.info("Usage: structurizr push|pull|lock|unlock|export|validate|inspect|list|version|help [options]");
+        log.info("Usage: structurizr push|pull|lock|unlock|export|merge|validate|inspect|list|version|help [options]");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/structurizr/cli/MergeCommand.java b/src/main/java/com/structurizr/cli/MergeCommand.java
index bc24f02..244f014 100644
--- a/src/main/java/com/structurizr/cli/MergeCommand.java
+++ b/src/main/java/com/structurizr/cli/MergeCommand.java
@@ -25,7 +25,7 @@ public void run(String... args) throws Exception {
         option.setRequired(true);
         options.addOption(option);
 
-        option = new Option("v", "view", true, "Key of the view to merge layout information for");
+        option = new Option("v", "view", true, "Key of the view to merge layout information for (optional)");
         option.setRequired(false);
         options.addOption(option);
 
diff --git a/src/main/java/com/structurizr/cli/StructurizrCliApplication.java b/src/main/java/com/structurizr/cli/StructurizrCliApplication.java
index b32f7f5..3c6c99f 100644
--- a/src/main/java/com/structurizr/cli/StructurizrCliApplication.java
+++ b/src/main/java/com/structurizr/cli/StructurizrCliApplication.java
@@ -91,12 +91,12 @@ public void run(String... args) {
 		}
 	}
 
-	private void printUsageMessageAndExit(String commandName) {
+	private void printUsageMessageAndExit(String commandName) throws Exception {
 		if (!StringUtils.isNullOrEmpty(commandName)) {
 			log.error("Error: " + commandName + " not recognised");
 		}
 
-		log.error("Usage: structurizr push|pull|lock|unlock|export|validate|inspect|list|version|help [options]");
+		new HelpCommand().run();
 		System.exit(1);
 	}