Better handling of failed initial save. Fixes #53.