Does the hot water demand indicator (the light by the tap symbol) stay on, or does it go off?
If it goes off, it's likely there is a problem with either the diverter valve or the microswitch.
If it stays on, and the burner cuts out, that's a different kettle of fish and it gets more complex.
BunSlinger
December 2008