diff --git a/MVMCore/MVMCore/Constants/MVMCoreConstants.h b/MVMCore/MVMCore/Constants/MVMCoreConstants.h
index e653ffe..21148ad 100644
--- a/MVMCore/MVMCore/Constants/MVMCoreConstants.h
+++ b/MVMCore/MVMCore/Constants/MVMCoreConstants.h
@@ -9,13 +9,6 @@
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 
-typedef NS_ENUM(NSInteger, MVMAppContext) {
-    MVMAppContextNone = 0,
-    MVMAppContextMF,
-    MVMAppContextMFPrepay,
-    MVMAppContextContentTransfer
-};
-
 typedef NS_ENUM(NSInteger, NavigationType) {
     NavigationTypePush = 0,
     NavigationTypeSet,
diff --git a/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m b/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m
index d16a7a5..d61075b 100644
--- a/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m
+++ b/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m
@@ -91,7 +91,9 @@
     NSString *type = [errorInfo string:KeyType];
     if (![ValueTypeSuccess isEqualToString:type]) {
         
-        MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:[errorInfo stringForKey:KeyErrorHeading] message:[errorInfo stringForKey:KeyUserMessage] messageToLog:[errorInfo stringForKey:KeyMessage] code:errorCode domain:ErrorDomainServer location:location];
+        NSString *title = [errorInfo string:KeyErrorHeading] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle];
+        NSString *message = [errorInfo string:KeyUserMessage] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess];
+        MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:title message:message messageToLog:[errorInfo string:KeyMessage] code:errorCode domain:ErrorDomainServer location:location];
         if ([ValueTypeErrorScreen isEqualToString:type]) {
             
             // If this is a server error screen, there should be no additional alerts... It will be handled by the load handler.