Better exception handling on auto save