Bug/cms 640/manager null fix