Improved and rectified some error messages