Fix NPE with dataManager