MSE-12 Fix IOException