1 files changed, 18 insertions, 2 deletions
diff --git a/ShiftOS_TheReturn/Localization.cs b/ShiftOS_TheReturn/Localization.cs
index 89d3582..2c701c9 100644
--- a/ShiftOS_TheReturn/Localization.cs
+++ b/ShiftOS_TheReturn/Localization.cs
@@ -167,8 +167,24 @@ namespace ShiftOS.Engine
             // if the user has saved then store their username and systemname in these string variables please
             if (SaveSystem.CurrentSave != null)
             {
-                usernameReplace = SaveSystem.CurrentUser.Username;
-                domainReplace = SaveSystem.CurrentSave.SystemName;
+                try
+                {
+                    usernameReplace = SaveSystem.CurrentUser.Username;
+                }
+                catch
+                {
+                        usernameReplace = "user";
+                }
+
+                try
+                {
+                    domainReplace = SaveSystem.CurrentSave.SystemName;
+                }
+                catch
+                {
+                    domainReplace = "system";
+                }
+                
             }
 
             string namespaceReplace = "";