Updated ObjectManager checks to current state of OM.