Formatting
Improved uncaught exception messages (E171)
Merge branch 'improve-exception-messages'