MSINM-54: Improve robustness of legacy MS imports