Story #1565: Fixed an error in the CLI exception handler. Modified SetupController a tiny bit.