Don't save the state, either, if we were not successful.

Another part of the fix for Bug: 13338
BFN