Base: Improved error handling