diff --git a/SharepointToolbox/Services/CsvValidationService.cs b/SharepointToolbox/Services/CsvValidationService.cs
index 3422736..abb4134 100644
--- a/SharepointToolbox/Services/CsvValidationService.cs
+++ b/SharepointToolbox/Services/CsvValidationService.cs
@@ -35,14 +35,14 @@ public class CsvValidationService : ICsvValidationService
                 var record = csv.GetRecord<T>();
                 if (record == null)
                 {
-                    rows.Add(CsvValidationRow<T>.ParseError(csv.Context.Parser.RawRecord, "Failed to parse row"));
+                    rows.Add(CsvValidationRow<T>.ParseError(csv.Context.Parser?.RawRecord ?? string.Empty, "Failed to parse row"));
                     continue;
                 }
                 rows.Add(new CsvValidationRow<T>(record, new List<string>()));
             }
             catch (Exception ex)
             {
-                rows.Add(CsvValidationRow<T>.ParseError(csv.Context.Parser.RawRecord, ex.Message));
+                rows.Add(CsvValidationRow<T>.ParseError(csv.Context.Parser?.RawRecord ?? string.Empty, ex.Message));
             }
         }
         return rows;
diff --git a/SharepointToolbox/Views/Tabs/TransferView.xaml.cs b/SharepointToolbox/Views/Tabs/TransferView.xaml.cs
index 5859138..ed110d9 100644
--- a/SharepointToolbox/Views/Tabs/TransferView.xaml.cs
+++ b/SharepointToolbox/Views/Tabs/TransferView.xaml.cs
@@ -91,7 +91,7 @@ public partial class TransferView : UserControl
 
     private void ConflictCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        if (ConflictCombo.SelectedIndex >= 0)
+        if (_viewModel != null && ConflictCombo.SelectedIndex >= 0)
         {
             _viewModel.ConflictPolicy = (ConflictPolicy)ConflictCombo.SelectedIndex;
         }