Add try/except on save