Base: Additional error handling improvements