diff --git a/MVMCoreUI/Alerts/MVMCoreAlertObject.m b/MVMCoreUI/Alerts/MVMCoreAlertObject.m
index 975c9540..17b7f113 100644
--- a/MVMCoreUI/Alerts/MVMCoreAlertObject.m
+++ b/MVMCoreUI/Alerts/MVMCoreAlertObject.m
@@ -54,8 +54,8 @@
     }
     
     __block MVMCoreAlertObject *alert = [[MVMCoreAlertObject alloc] init];
-    alert.title = [responseInfo stringForKey:KeyErrorHeading];
-    alert.message = [responseInfo stringForKey:KeyUserMessage];
+    alert.title = [responseInfo string:KeyErrorHeading] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle];
+    alert.message = [responseInfo string:KeyUserMessage] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess];
     
     NSString *messageStyle = [responseInfo stringForKey:KeyMessageStyle];
     if ([ValueTypeFieldErrors isEqualToString:[responseInfo string:KeyType]]) {
@@ -151,9 +151,9 @@
 + (nullable instancetype)alertObjectWithPage:(nullable NSDictionary *)page isGreedy:(BOOL)isGreedy additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject error:(MVMCoreErrorObject *_Nullable *_Nullable)error {
     
     MVMCoreAlertObject *alert = [[MVMCoreAlertObject alloc] init];
-    alert.title = [page stringForKey:KeyTitle];
+    alert.title = [page string:KeyTitle] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle];
     alert.pageJson = page;
-    alert.message = [page stringForKey:KeyMessage];
+    alert.message = [page string:KeyMessage] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess];
     alert.isGreedy = isGreedy;
     alert.type = MFAlertTypePopup;
     alert.alertStyle = UIAlertControllerStyleAlert;
@@ -217,9 +217,8 @@
 + (nullable instancetype)alertObjectForPageType:(nullable NSString *)pageType responseInfo:(nullable NSDictionary *)responseInfo additionalData:(nullable NSDictionary *)additionalData actionDelegate:(nullable NSObject <MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)actionDelegate {
     
     __block MVMCoreAlertObject *alert = [[MVMCoreAlertObject alloc] init];
-    alert.title = [responseInfo stringForKey:KeyErrorHeading];
-    alert.message = [responseInfo stringForKey:KeyUserMessage];
-    
+    alert.title = [responseInfo string:KeyErrorHeading] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle];
+    alert.message = [responseInfo string:KeyUserMessage] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess];
     NSString *messageStyle = [responseInfo stringForKey:KeyMessageStyle];
     if ([ValueTypeFieldErrors isEqualToString:[responseInfo string:KeyType]]) {
         
@@ -279,9 +278,9 @@
 + (nullable instancetype)alertObjectWithPage:(nullable NSDictionary *)page isGreedy:(BOOL)isGreedy additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate error:(MVMCoreErrorObject *_Nullable *_Nullable)error {
     
     MVMCoreAlertObject *alert = [[MVMCoreAlertObject alloc] init];
-    alert.title = [page stringForKey:KeyTitle];
+    alert.title = [page string:KeyTitle] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle];
     alert.pageJson = page;
-    alert.message = [page stringForKey:KeyMessage];
+    alert.message = [page string:KeyMessage] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess];
     alert.isGreedy = isGreedy;
     alert.type = MFAlertTypePopup;
     alert.alertStyle = UIAlertControllerStyleAlert;
diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index d0c5b238..d7e947db 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -351,7 +351,6 @@ import UIKit
     open func pageShown() {
         // Update split view properties if this is the current detail controller.
         if self == MVMCoreUISplitViewController.main()?.getCurrentDetailViewController() {
-            MVMCoreUISplitViewController.main()?.setupPanels()
             MVMCoreUISplitViewController.main()?.setBottomProgressBarProgress(bottomProgress() ?? 0)
             updateTabBar()
         }
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
index 98a4c078..a4bbcb08 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
@@ -135,6 +135,7 @@ extension MVMCoreUISplitViewController: MVMCoreViewManagerProtocol {
     }
     
     public func displayedViewController(_ viewController: UIViewController) {
+        setupPanels()
         updateNavigationBarFor(viewController: viewController)
     }