make ObjectManager more robust