Improved error handling for MF paste