Merge error handling