CB-5435 Handle missing preferences gracefully