Make null-check more idiomatic.