Added some more info to error messages