@warrenseen safely can return nil, so the || {} needs to be outside the block. @stevehodgkiss I've simplified the logic.