Add better error message in case of failure.