Cleanup: Ensure failures get logged with exception string