Fix for save no longer working if initial save attempt failed.

Change-Id: I3544a26cbe576ccadcce1be28c56f5d80f0f38fb