Fix possible nil when pushing state for the first time