Added guards against failed saves