 
         let parentNavController = ElloNavigationController(rootViewController: loggedOutController)
 
-        swapViewController(parentNavController) {
-            if let deepLinkPath = self.deepLinkPath {
-                self.navigateToDeepLink(deepLinkPath)
-                self.deepLinkPath = nil
-            }
+        swapViewController(parentNavController).always {
+            guard let deepLinkPath = self.deepLinkPath else { return }
+
+            self.navigateToDeepLink(deepLinkPath)
+            self.deepLinkPath = nil
         }
     }
 

        let vc = OnboardingViewController()
        vc.currentUser = user

        swapViewController(vc) {}
    }

    func doneOnboarding() {

            newViewController.didMove(toParentViewController: self)

            self.visibleViewController = newViewController
            resolve(Void())
        })

        return promise
    }

    func removeViewController(_ completion: @escaping Block = {}) {
