Add more context to the error messages