Fixed the error message handling on merge script
Missed one