upstream
make sure commentaries can generally be seen in errors to help clarify reasons for failures