Migration: more robust error checking for missing fields