removed orNull calls