Merge "Add null check for entry key" into main