[FIX] Typo masked by previous try..except

 * See previous commit
[FIX] Account for non-migrated fields