Added some stuff to error messages