Merge "Fix null pointer exceptions"