Add defensive coding check to 2.3 migration for entry order field