Fixed the crashing on subsequent startups with a more propper exit with finish()