Merge "exception: Improve formatting of fatal error log messages"