Little better catching of unhandled exceptions
Fixed a fatal exception.