A water heater may be configured to detect a possible main gas valve non-closure condition in which the sensed water temperature continues to rise while a thermopile signal reaches a stable state. When the possible main gas valve non-closure condition is detected, the controller may be configured to toggle the main gas valve ON and determine whether the thermopile signal from the thermopile changes from the stable state or not by at least a predetermined amount.