can  you change this to a more generic work flow 

If it fails before you declare finished_form then the clean up part will fail