Merge "Fix potential npe"