Removed some control coupling in handleOrphans()