Back out should saving the main context fail
Should fix issue #18