Add additional info in failure message to help problem resolution