Merge "Don't dereference a null pointer"