Move save to member, tweak error handling