improved more error messages.