A heater for a liquid has a combustion chamber, a jacket for the liquid extending about the combustion chamber and a burner head assembly connected to the combustion chamber. The burner head assembly includes a housing having a burner mounted thereon and a hollow interior. A control module and a fan are mounted in the hollow interior, the fan being connected to an electric motor. A compressor and a fuel pump are mounted on the housing and are operatively connected to the electric motor. The control module may include controls for exercising components of the heater prior to combustion, thereby verifying operation of these components. Preferably there is a speed control for the motor, such as a closed loop speed control which regulates motor speed and accordingly output of the heater. Preferably there is a backup system using a lookup table in the event that the closed loop speed control fails. Also preferably there is provision for monitoring flame sensor functionality by providing an indicator light which mirrors operation of the flame sensor. The heater may have a selective soft start for the coolant pump which operates only when required so as to reduce unnecessary chatter on the motor relay. A system is also provided for distinguishing true overcurrent faults from overcurrents arising from voltage changes during starting of the vehicle engine. Reignition algorithms are provided to restart the burner in the event of flame sputters caused, for example, by fuel bubbles, but shut off the heater in the event that the fuel is truly cut off.