Better logging and exception handling
4 files changed