Change handling of `nil`