minor improvements on current error messages