Merge "Fix null pointer reference." into main