Guarantee against data loss by preventing race condition on save

I had a suggestion on a different issue