Merge "Handle null correctly."