Error messages

Bugfixes #682, #605.

__Deployed:__ http://cz-dec2013-alex-test.azurewebsites.net/sandbox
__Link to code review:__ http://mrccodereview.cloudapp.net/ui#review:id=6314