* Handle context closing on error
Co-Authored-By: Sebastian Stammler <seb@oplabs.co>

* Add clarifying comment

---------
Co-authored-by: Sebastian Stammler <seb@oplabs.co>