Merge "Fix potential null pointers"