* Fix crash that would sometimes occur due to invalid persisted data