Manage the None issue