Code version updates
Provide more graceful teardown failure