I would endorse changing it so that you cannot save the game while in combat.

This could also help prevent some inescapable save game states (where you get into a state where you cannot win or progress and thus screw your whole game).