Properly check that claims aren't null before adding them