Fixed default error handling