Add temporary shutdown procedure
Clean up error handling