--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java	Mon Dec 16 23:17:34 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java	Fri Dec 20 16:34:07 2013 +0100
@@ -32,11 +32,17 @@
 	private Configuration configuration;
 
 	public static void main(String[] args) {
+
+		if (args.length == 0) {
+			args = new String[]{CLIParser.Tokens.INFO_HELP};
+		}
+
 		try {
 			CLIParser parser = new CLIParser();
 			CLIOptions options = parser.parseOptions(args);
 			options.validate();
 			CLIStarter starter = new CLIStarter(options);
+			starter.installDefaultConfiguration();
 			starter.process();
 		} catch (CLIParserException e) {
 			log.log(Level.SEVERE, "Unable to parse CLI options", e);
@@ -76,7 +82,6 @@
 	@Override
 	public Configuration getConfiguration() {
 		if (configuration == null) {
-			installDefaultConfiguration();
 			configuration = loadConfiguration();
 		}
 		return configuration;