Merge pull request #342 from vadimi/master

Improve unhandled error handling in prod mode
Revert "Improve unhandled error handling in prod mode"

This reverts commit c2079276ebfa00cc03c738af4af99348deb5a287.
Restore SimpleServerError method