diff --git a/XamlStudio/Views/DataSources.xaml.cs b/XamlStudio/Views/DataSources.xaml.cs
index 477f6bf..1846e32 100644
--- a/XamlStudio/Views/DataSources.xaml.cs
+++ b/XamlStudio/Views/DataSources.xaml.cs
@@ -85,6 +85,11 @@ private void DataSources_Loaded(object sender, RoutedEventArgs e)
 
     public void Receive(ActiveDocumentViewModelChangedMessage message)
     {
+        if (message.NewDocVM is null)
+        {
+            return;
+        }
+
         // Update are shadow-copy based on MainViewModel
         _activeDocument = message.NewDocVM.Document;
         ActiveDataContext = _activeDocument.DataContext;
diff --git a/XamlStudio/Views/Properties.xaml.cs b/XamlStudio/Views/Properties.xaml.cs
index af8d413..583c804 100644
--- a/XamlStudio/Views/Properties.xaml.cs
+++ b/XamlStudio/Views/Properties.xaml.cs
@@ -51,7 +51,7 @@ private void Properties_Loaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
         WeakReferenceMessenger.Default.RegisterAll(this);
 
         // Check if there's a render and initialize our existing state
-        if (MainViewModel.ActiveDocumentViewModel.HasCompiled)
+        if (MainViewModel.ActiveDocumentViewModel?.HasCompiled ?? false)
         {
             Receive(new XamlRenderedMessage(MainViewModel.ActiveDocumentViewModel.Result));
         }