diff --git a/Tusker/Screens/Utilities/MultiColumnNavigationController.swift b/Tusker/Screens/Utilities/MultiColumnNavigationController.swift
index e1537c8de7..48bf7e0839 100644
--- a/Tusker/Screens/Utilities/MultiColumnNavigationController.swift
+++ b/Tusker/Screens/Utilities/MultiColumnNavigationController.swift
@@ -142,8 +142,8 @@ class MultiColumnNavigationController: UIViewController {
     }
     
     fileprivate func closeColumn(_ vc: UIViewController) {
-        let index = viewControllers.firstIndex(of: vc)!
-        guard index > 0 else {
+        guard let index = viewControllers.firstIndex(of: vc),
+              index > 0 else {
             // Can't close the last column
             return
         }