Minor fix to ensure if the builder is cancelled while shutting down, then the app will exit as soon as it returns.