Merge "Fix warnings: "member call on null pointer of type""