diff --git a/RotationSolver.Basic/Data/IconSet.cs b/RotationSolver.Basic/Data/IconSet.cs
index b0d3922de..3631c5e40 100644
--- a/RotationSolver.Basic/Data/IconSet.cs
+++ b/RotationSolver.Basic/Data/IconSet.cs
@@ -36,14 +36,14 @@ public static TextureWrap GetTexture(uint id)
                 Task.Run(() =>
                 {
                     texture = Service.GetTextureIcon(id);
-                    _textures.Add(id, texture);
+                    _textures[id] = texture;
                 });
             }
 
             if (!_textures.TryGetValue(0, out texture))
             {
                 texture = Service.GetTextureIcon(0);
-                _textures.Add(0, texture);
+                _textures[0] = texture;
             }
             return texture;
         }
diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
index 8d5426fdc..f7d7958ea 100644
--- a/RotationSolver/Updaters/MajorUpdater.cs
+++ b/RotationSolver/Updaters/MajorUpdater.cs
@@ -86,17 +86,24 @@ private static void UpdateWork()
         if (_work) return;
         _work = true;
 
-        PreviewUpdater.UpdateCastBarState();
-        TargetUpdater.UpdateTarget();
-        ActionUpdater.UpdateActionInfo();
+        try
+        {
+            PreviewUpdater.UpdateCastBarState();
+            TargetUpdater.UpdateTarget();
+            ActionUpdater.UpdateActionInfo();
 
-        RotationUpdater.UpdateRotation();
+            RotationUpdater.UpdateRotation();
 
-        TimeLineUpdater.UpdateTimelineAction();
-        ActionUpdater.UpdateNextAction();
-        RSCommands.UpdateRotationState();
+            TimeLineUpdater.UpdateTimelineAction();
+            ActionUpdater.UpdateNextAction();
+            RSCommands.UpdateRotationState();
 
-        InputUpdater.UpdateCommand();
+            InputUpdater.UpdateCommand();
+        }
+        catch (Exception ex)
+        {
+            PluginLog.Error(ex, "Inner Worker Exception");
+        }
 
         _work = false;
     }