Fixes for 5.8:
- Fix a resource leak on an error bailout.