Make sure we display exceptions generated during server startup.
Merge branch 'master' into stable