Fix npe with dataManager