Broader exception handling for invalid options in the salt command. 

Refs #8016.