Heater failure handling improved.