Improve handling of Launcher failures (#43)