Fix AIRAVATA-1452 for error messages.
merged the changes