Bug Fix: Bootstrapper crash if previously failed

Updated bootstrapper correctly cleans up temporary files left by a
previous run which failed.