Migration fix + better error message in omsh if migration fails