diff --git a/src/NodeServices/WorkspaceEvents.cs b/src/NodeServices/WorkspaceEvents.cs
index 2159ac818ce..febe967650a 100644
--- a/src/NodeServices/WorkspaceEvents.cs
+++ b/src/NodeServices/WorkspaceEvents.cs
@@ -87,7 +87,13 @@ internal static void OnWorkspaceSettingsChanged(bool enableLegacyPolyCurveBehavi
             var handler = WorkspaceEnableLegacyPolyCurveSettingChanged;
             if (handler != null)
             {
-                handler(new WorkspacesSettingsChangedEventArgs(enableLegacyPolyCurveBehavior));
+                try
+                {
+                    handler(new WorkspacesSettingsChangedEventArgs(enableLegacyPolyCurveBehavior));
+                }
+                catch (NullReferenceException)
+                {
+                }
             }
         }
     }