Work on heater error message handling