* Addeded another case to catch error messages to be returned