Improve controller exception handling #215

see #215