Improve problem handling within the controller
Proposed corrections from jreidinger;
puts messages into brackets for gettext