A step towards better error handling