Configured logging
Improved error handling/logging