fix: Invoke deferred cleanup after error handling

fix: Invoke deferred cleanup after error handling #10387