Handle avl_delete_* returning nil better.