Merge "Fix potential null pointer places"