added null check to Control panel manager