added check for null when user comes back as null