Switch to Manual Migration - Production Schema Fix

Found Production schema differs to some other schemas. Added conditional
logic to cater for possibly missing index that was previously expected.
Additional minor error reporting enhancement.