Removed the CommandException and replaced with a return as the stacktrace was cutting off the printing of the usage.