Updated Error messages.
Merge branch 'tp'