Improve Controller Exception handling (#215)

see #215