Fixes no finish trigger when errors occur