Reduce the number of cases where it is necessary to check for NULL after

the loop terminating condition.

FossilOrigin-Name: 3c1ae447dec8fc2af1c5105134061717594ac0e0