Fixed null pointer in Manager