diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
index e9d0eb65..963834ff 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
@@ -43,14 +43,14 @@ public extension MVMCoreUISplitViewController {
     }
     
     /// Sets the left navigation items for the view controller based on model and splitview.
-    func setLeftNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
+    func setLeftNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol?, viewController: UIViewController) {
         var leftItems: [UIBarButtonItem] = []
         let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
 
         // Add back button first.
-        if navigationItemModel.alwaysShowBackButton ?? false != false {
-            if let backButtonModel = navigationItemModel.backButton {
-                if navigationController.viewControllers.count > 1 || navigationItemModel.alwaysShowBackButton ?? false {
+        if navigationItemModel?.alwaysShowBackButton != false {
+            if let backButtonModel = navigationItemModel?.backButton {
+                if navigationController.viewControllers.count > 1 || navigationItemModel!.alwaysShowBackButton ?? false {
                     leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
                 }
             } else if let backButton = backButton,
@@ -67,7 +67,7 @@ public extension MVMCoreUISplitViewController {
         }
         
         // Add other model buttons
-        if let leftItemModels = navigationItemModel.additionalLeftButtons {
+        if let leftItemModels = navigationItemModel?.additionalLeftButtons {
             for item in leftItemModels {
                 leftItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
             }
@@ -82,7 +82,7 @@ public extension MVMCoreUISplitViewController {
     }
     
     /// Sets the right navigation items for the view controller based on model and splitview.
-    func setRightNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
+    func setRightNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol?, viewController: UIViewController) {
         let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
         var rightItems: [UIBarButtonItem] = []
         
@@ -94,7 +94,7 @@ public extension MVMCoreUISplitViewController {
         }
         
         // Add other model buttons
-        if let rightItemModels = navigationItemModel.additionalRightButtons {
+        if let rightItemModels = navigationItemModel?.additionalRightButtons {
             for item in rightItemModels {
                 rightItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
             }