Merge "Fix null pointer dereference."