Merge "Fix potential null pointer"