Add more details to error message