Merge "Don't NPE on command line parse failure."