Improve fatal error handling.

[originally from svn r5185]