Added additional info to error messages