ref #90: add extra orphan checks