Merge "Add a null check." into main