Merge exception-handling-console branch