Quick performance improvement in componentmgr -removed null checks