Code cleanups, no need to call cleanup twice, the finally really does work. Also capture the future result so we can show exceptions from startup/shutdown of a container.