Use Calibrate to improve error handling