added class for error message display
fixed catch-blocks in the controllers
Merge branch 'Oskar'