TRUNK-1906 added error messages