TRUNK-1906 added error messages
Merge branches 'master' and 'TRUNK-1906'