Merge "Add null check and logging" into main