Add more information to error message