Fix undefined error
Don't choke on missing persistence handlers

Includes test case