add check for None