Null check clean-up