More error handling around persistence (old).