EClaesson Improved error messages