diff --git a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor
index 91751ec..9454bae 100644
--- a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor
+++ b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor
@@ -19,7 +19,7 @@
 						<div class="col-12 col-sm-6 mb-2">
                             <label class="form-label">Bucket Group:</label>
                             <select class="form-select form-select-sm" 
-                                    @bind:get="DataContext.SelectedBucketGroup.Id.ToString()"
+                                    @bind:get="DataContext.SelectedBucketGroup!.Id.ToString()"
                                     @bind:set="BucketGroup_SelectionChanged">
                                 @foreach (var bucketGroup in DataContext.AvailableBucketGroups!)
                                 {
@@ -75,7 +75,7 @@
                             <label class="form-label">Background Color:</label>
                             <select class="form-select form-select-sm" style="background-color: @ColorTranslator.ToHtml(DataContext.Color); color: @ColorTranslator.ToHtml(DataContext.TextColor)"
                                     @bind:get="DataContext.ColorCode"
-                                    @bind:set="(value) => { DataContext.ColorCode = value; }">
+                                    @bind:set="(value) => { DataContext.ColorCode = value!; }">
                                 @foreach (var color in DataContext.AvailableColors!)
                                 {
                                     <option style="background-color: @ColorTranslator.ToHtml(color); color: @ColorTranslator.ToHtml(DataContext.TextColor)" value="@color.Name">@color.Name</option>
@@ -86,7 +86,7 @@
                             <label class="form-label">Text Color:</label>
                             <select class="form-select form-select-sm" style="background-color: @ColorTranslator.ToHtml(DataContext.Color); color: @ColorTranslator.ToHtml(DataContext.TextColor)"
                                     @bind:get="DataContext.TextColorCode"
-                                    @bind:set="(value) => { DataContext.TextColorCode = value; }">
+                                    @bind:set="(value) => { DataContext.TextColorCode = value!; }">
                                 @foreach (var color in DataContext.AvailableColors!)
                                 {
                                     <option style="background-color: @ColorTranslator.ToHtml(DataContext.Color); color: @ColorTranslator.ToHtml(color)" value="@color.Name">@color.Name</option>
@@ -177,6 +177,6 @@
     void BucketGroup_SelectionChanged(string? value)
     {
         if (string.IsNullOrEmpty(value)) return;
-        DataContext.SelectedBucketGroup = DataContext.AvailableBucketGroups.First(i => i.Id == Guid.Parse(value));
+        DataContext.SelectedBucketGroup = DataContext.AvailableBucketGroups!.First(i => i.Id == Guid.Parse(value));
     }
 }
diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs
index e90ecc6..aa069bc 100644
--- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs
+++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs
@@ -40,11 +40,11 @@ public BucketVersionViewModel BucketVersion
         set => Set(ref _bucketVersion, value);
     }
     
-    private BucketGroup _selectedBucketGroup;
+    private BucketGroup? _selectedBucketGroup;
     /// <summary>
     /// <see cref="BucketGroup"/> to which this Bucket is assigned to
     /// </summary>
-    public BucketGroup SelectedBucketGroup
+    public BucketGroup? SelectedBucketGroup
     {
         get => _selectedBucketGroup; 
         set => Set(ref _selectedBucketGroup, value);
@@ -319,18 +319,24 @@ protected BucketViewModel(BucketViewModel viewModel) : base(viewModel.ServiceMan
         _isProgressBarVisible = viewModel.IsProgressbarVisible;
         _isHovered = viewModel.IsHovered;
 
-        AvailableColors = new ObservableCollection<Color>();
-        foreach (var availableColor in viewModel.AvailableColors)
+        if (viewModel.AvailableColors != null)
         {
-            AvailableColors.Add(availableColor);
+            AvailableColors = new ObservableCollection<Color>();
+            foreach (var availableColor in viewModel.AvailableColors)
+            {
+                AvailableColors.Add(availableColor);
+            }
         }
-        
-        AvailableBucketGroups = new ObservableCollection<BucketGroup>();
-        foreach (var item in viewModel.AvailableBucketGroups)
+
+        if (viewModel.AvailableBucketGroups != null)
         {
-            AvailableBucketGroups.Add(item);
+            AvailableBucketGroups = new ObservableCollection<BucketGroup>();
+            foreach (var item in viewModel.AvailableBucketGroups)
+            {
+                AvailableBucketGroups.Add(item);
+            }
         }
-        
+
         _currentYearMonth = viewModel._currentYearMonth;
     }
 
@@ -550,7 +556,7 @@ internal override Bucket ConvertToDto()
         {
             Id = BucketId,
             Name = Name,
-            BucketGroupId = SelectedBucketGroup.Id,
+            BucketGroupId = SelectedBucketGroup!.Id,
             ColorCode = ColorCode,
             TextColorCode = TextColorCode,
             ValidFrom = ValidFrom,
diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs
index dab689b..16374e0 100644
--- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs
+++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs
@@ -148,6 +148,7 @@ public PartialBucketViewModel(PartialBucketViewModel viewModel) : base(viewModel
         _selectedBucketName = viewModel.SelectedBucketName;
         _selectedBucketColorCode = viewModel.SelectedBucketColorCode;
         _selectedBucketTextColorCode = viewModel.SelectedBucketTextColorCode;
+        _selectedBucketOutput = viewModel.SelectedBucketOutput;
         _amount = viewModel.Amount;
     }
 
diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs
index 37470a0..9526bd7 100644
--- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs
+++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs
@@ -593,6 +593,8 @@ public void StartModification()
 
     public void CancelModification()
     {
+        if (_oldTransactionViewModelItem == null) return;
+        
         SelectedAccount = _oldTransactionViewModelItem.SelectedAccount;
         TransactionDate = _oldTransactionViewModelItem.TransactionDate;
         Payee = _oldTransactionViewModelItem.Payee;