Merge pull request #251 from lowjoel/consolidate-exceptions-in-controller
Consolidate exceptions in controller

(main@1cf87f766e6c977a999790a17bb490c12390f214)