System.NullReferenceException: Object reference not set to an instanc…

…e of an object.

   at MixItUp.Base.Util.ResetTrackerViewModel..ctor(ResetTracker model)
   at MixItUp.Base.ViewModel.Overlay.OverlayGoalV3ViewModel..ctor(OverlayGoalV3Model item)
   at MixItUp.Base.ViewModel.Overlay.OverlayWidgetV3ViewModel..ctor(OverlayWidgetV3Model widget)
   at MixItUp.WPF.Windows.Overlay.OverlayWidgetV3EditorWindow..ctor(OverlayWidgetV3Model item) in S:\Code\mixer-mixitup\MixItUp.WPF\Windows\Overlay\OverlayWidgetV3EditorWindow.xaml.cs:line 33
   at MixItUp.WPF.Controls.MainControls.OverlayWidgetsControl.EditButton_Click(Object sender, RoutedEventArgs e) in S:\Code\mixer-mixitup\MixItUp.WPF\Controls\MainControls\OverlayWidgetsControl.xaml.cs:line 75

MixItUp.Base/Model/Overlay/OverlayGoalV3Model.cs

@@ -188,6 +188,11 @@ public override async Task Initialize()
         {
             await base.Initialize();
 
+            if (this.ResetTracker == null)
+            {
+                this.ResetTracker = new ResetTracker();
+            }
+
             CounterModel.OnCounterUpdated -= CounterModel_OnCounterUpdated;
             if (this.GoalType == OverlayGoalV3Type.Counter && ChannelSession.Settings.Counters.TryGetValue(this.CounterName, out CounterModel counter))
             {

MixItUp.Base/Util/ResetTracker.cs

@@ -115,7 +115,7 @@ public ResetTrackerViewModel()
 
         public ResetTrackerViewModel(ResetTracker model)
         {
-            this.Model = model;
+            this.Model = model ?? new ResetTracker();
             this.Model.UpgradeToNewerFormat();
         }