diff --git a/Directory.Build.props b/Directory.Build.props
index b4062adb5049..5731e23a25bd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,7 @@
     <WindowsSdkPackageVersion>10.0.26100.67-preview</WindowsSdkPackageVersion>
     <WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>
     <LangVersion>preview</LangVersion>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
 
     <!--  Use Microsoft.Testing.Platform  -->
     <EnableMSTestRunner>true</EnableMSTestRunner>
diff --git a/src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs b/src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs
index decf6588f52b..aa99018edafc 100644
--- a/src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs
+++ b/src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs
@@ -15,6 +15,6 @@ public interface IOmnibarTextMemberPathProvider
 		/// Retrieves the path of the text member as a string. This path can be used to identify the location of the text member.
 		/// </summary>
 		/// <returns>Returns a string representing the path of the text member.</returns>
-		string GetTextMemberPath(string textMemberPath);
+		string? GetTextMemberPath(string textMemberPath);
 	}
 }
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.cs b/src/Files.App.Controls/Omnibar/Omnibar.cs
index 707dd90bfc58..7e7528f1e84f 100644
--- a/src/Files.App.Controls/Omnibar/Omnibar.cs
+++ b/src/Files.App.Controls/Omnibar/Omnibar.cs
@@ -275,7 +275,7 @@ private string GetObjectText(object obj)
 			return obj is string text
 				? text
 				: obj is IOmnibarTextMemberPathProvider textMemberPathProvider
-					? textMemberPathProvider.GetTextMemberPath(CurrentSelectedMode.TextMemberPath ?? string.Empty)
+					? textMemberPathProvider.GetTextMemberPath(CurrentSelectedMode.TextMemberPath ?? string.Empty) ?? string.Empty
 					: obj.ToString() ?? string.Empty;
 		}
 
diff --git a/src/Files.App.Controls/Sidebar/ISidebarItemModel.cs b/src/Files.App.Controls/Sidebar/ISidebarItemModel.cs
index eedd91e8f4d1..9d2a3038f262 100644
--- a/src/Files.App.Controls/Sidebar/ISidebarItemModel.cs
+++ b/src/Files.App.Controls/Sidebar/ISidebarItemModel.cs
@@ -1,10 +1,24 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Microsoft.UI.Xaml;
+
 namespace Files.App.Controls
 {
+	public interface ISidebarItemPresentationModel
+	{
+		string? Text { get; }
+
+		object? ToolTip { get; }
+
+		FrameworkElement? IconElement { get; }
+
+		FrameworkElement? ItemDecorator { get; }
+	}
+
 	public interface ISidebarItemModel : INotifyPropertyChanged
 	{
+
 		/// <summary>
 		/// The children of this item that will be rendered as child elements of the SidebarItem
 		/// </summary>
diff --git a/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs b/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs
index 6d6565235a6a..1ea83c56edc9 100644
--- a/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs
+++ b/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs
@@ -83,7 +83,15 @@ public ISidebarItemModel? Item
 			set { SetValue(ItemProperty, value); }
 		}
 		public static readonly DependencyProperty ItemProperty =
-			DependencyProperty.Register(nameof(Item), typeof(ISidebarItemModel), typeof(SidebarItem), new PropertyMetadata(null));
+			DependencyProperty.Register(nameof(Item), typeof(ISidebarItemModel), typeof(SidebarItem), new PropertyMetadata(null, OnPropertyChanged));
+
+		public bool UseItemPresentation
+		{
+			get { return (bool)GetValue(UseItemPresentationProperty); }
+			set { SetValue(UseItemPresentationProperty, value); }
+		}
+		public static readonly DependencyProperty UseItemPresentationProperty =
+			DependencyProperty.Register(nameof(UseItemPresentation), typeof(bool), typeof(SidebarItem), new PropertyMetadata(false, OnPropertyChanged));
 
 		public bool UseReorderDrop
 		{
@@ -136,12 +144,18 @@ public static void OnPropertyChanged(DependencyObject sender, DependencyProperty
 			}
 			else if (e.Property == IsExpandedProperty)
 			{
+				if (item.UseItemPresentation && item.Item is { } model && model.IsExpanded != item.IsExpanded)
+					model.IsExpanded = item.IsExpanded;
 				item.UpdateExpansionState();
 			}
 			else if (e.Property == ItemProperty)
 			{
 				item.HandleItemChange();
 			}
+			else if (e.Property == UseItemPresentationProperty && item.UseItemPresentation)
+			{
+				item.UpdateItemPresentation();
+			}
 			else
 			{
 				Debug.Write(e.Property.ToString());
diff --git a/src/Files.App.Controls/Sidebar/SidebarItem.cs b/src/Files.App.Controls/Sidebar/SidebarItem.cs
index 11ceb259ad43..4eee8b2c6dd5 100644
--- a/src/Files.App.Controls/Sidebar/SidebarItem.cs
+++ b/src/Files.App.Controls/Sidebar/SidebarItem.cs
@@ -90,7 +90,10 @@ protected override void OnApplyTemplate()
 				if (GetTemplateChild("ChevronContainer") is Border chevronContainer)
 					chevronContainer.PointerPressed += ChevronContainer_PointerPressed;
 				if (GetTemplateChild("FlyoutChildrenPresenter") is ItemsRepeater flyoutRepeater)
+				{
 					flyoutRepeater.ElementPrepared += FlyoutChildrenPresenter_ElementPrepared;
+					flyoutRepeater.ItemsSource = Item?.Children;
+				}
 			}
 
 			if (Owner is null)
@@ -124,11 +127,31 @@ private void SidebarItem_Loaded(object sender, RoutedEventArgs e)
 		public void HandleItemChange()
 		{
 			HookupItemChangeListener(null, Item);
+			if (UseItemPresentation)
+				UpdateItemPresentation();
+			UpdateFlyoutChildrenSource();
 			UpdateExpansionState();
 			ReevaluateSelection();
 			CanDrag = Item?.Path is string path && Path.IsPathRooted(path);
 		}
 
+		private void UpdateItemPresentation()
+		{
+			var presentation = Item as ISidebarItemPresentationModel;
+			AutomationProperties.SetAutomationId(this, presentation?.Text ?? string.Empty);
+			Text = presentation?.Text;
+			ToolTip = presentation?.ToolTip;
+			Icon = presentation?.IconElement;
+			Decorator = presentation?.ItemDecorator;
+			IsExpanded = Item?.IsExpanded ?? true;
+		}
+
+		private void UpdateFlyoutChildrenSource()
+		{
+			if (GetTemplateChild("FlyoutChildrenPresenter") is ItemsRepeater flyoutRepeater)
+				flyoutRepeater.ItemsSource = Item?.Children;
+		}
+
 		private void HookupOwners()
 		{
 			// Owner is pushed in by the hosting SidebarView's MenuItemsHost_ElementPrepared (top-level rows) or the parent SidebarItem's FlyoutChildrenPresenter_ElementPrepared (flyout children) before Loaded fires. Static SidebarItems declared directly in XAML (MainPage's SettingsButton in SidebarView.Footer) aren't realized through either path, so resolve Owner via a visual-tree walk for them. OwnerExpansionSupport state is applied by OnOwnerChanged.
@@ -181,9 +204,46 @@ private void Item_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			switch (e.PropertyName)
 			{
+				case null:
+				case "":
+					if (UseItemPresentation)
+						UpdateItemPresentation();
+					UpdateFlyoutChildrenSource();
+					UpdateExpansionState();
+					ReevaluateSelection();
+					break;
+				case nameof(ISidebarItemPresentationModel.Text):
+					if (UseItemPresentation)
+					{
+						var presentation = Item as ISidebarItemPresentationModel;
+						Text = presentation?.Text;
+						AutomationProperties.SetAutomationId(this, presentation?.Text ?? string.Empty);
+					}
+					break;
+				case nameof(ISidebarItemPresentationModel.ToolTip):
+					if (UseItemPresentation)
+						ToolTip = (Item as ISidebarItemPresentationModel)?.ToolTip;
+					break;
+				case nameof(ISidebarItemPresentationModel.IconElement):
+					if (UseItemPresentation)
+						Icon = (Item as ISidebarItemPresentationModel)?.IconElement;
+					break;
+				case nameof(ISidebarItemPresentationModel.ItemDecorator):
+					if (UseItemPresentation)
+						Decorator = (Item as ISidebarItemPresentationModel)?.ItemDecorator;
+					break;
+				case nameof(ISidebarItemModel.IsExpanded):
+					if (UseItemPresentation)
+						IsExpanded = Item?.IsExpanded ?? true;
+					UpdateExpansionState();
+					break;
 				case nameof(ISidebarItemModel.HasUnrealizedChildren):
 				case nameof(ISidebarItemModel.IsLeafWithChildren):
+					UpdateExpansionState();
+					ReevaluateSelection();
+					break;
 				case nameof(ISidebarItemModel.Children):
+					UpdateFlyoutChildrenSource();
 					UpdateExpansionState();
 					ReevaluateSelection();
 					break;
diff --git a/src/Files.App.Controls/Sidebar/SidebarStyles.xaml b/src/Files.App.Controls/Sidebar/SidebarStyles.xaml
index 004f6683cf04..b3ab9b44b1e8 100644
--- a/src/Files.App.Controls/Sidebar/SidebarStyles.xaml
+++ b/src/Files.App.Controls/Sidebar/SidebarStyles.xaml
@@ -36,20 +36,6 @@
 		<Setter Target="Padding" Value="0" />
 	</Style>
 
-	<DataTemplate x:Key="DefaultSidebarItemTemplate">
-		<local:SidebarItem
-			AutomationProperties.AutomationId="{Binding Item.Text}"
-			ContentOpacity="{Binding RowOpacity}"
-			Decorator="{Binding Item.ItemDecorator}"
-			Icon="{Binding Item.IconElement}"
-			IsExpanded="{Binding Item.IsExpanded, Mode=TwoWay}"
-			Item="{Binding Item}"
-			Margin="{Binding SectionGapMargin}"
-			NestingLevel="{Binding Depth}"
-			Text="{Binding Item.Text}"
-			ToolTip="{Binding Item.ToolTip}" />
-	</DataTemplate>
-
 	<Style TargetType="local:SidebarItem">
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="Template">
@@ -211,19 +197,13 @@
 											x:Name="FlyoutChildrenPresenter"
 											HorizontalAlignment="Stretch"
 											AutomationProperties.AccessibilityView="Content"
-											ItemsSource="{Binding Item.Children, Mode=OneWay}"
 											XYFocusKeyboardNavigation="Enabled">
 											<ItemsRepeater.ItemTemplate>
 												<DataTemplate>
 													<local:SidebarItem
-														AutomationProperties.AutomationId="{Binding Text}"
-														Decorator="{Binding ItemDecorator}"
-														Icon="{Binding IconElement}"
-														IsExpanded="{Binding IsExpanded, Mode=TwoWay}"
 														IsInFlyout="True"
 														Item="{Binding}"
-														Text="{Binding Text}"
-														ToolTip="{Binding ToolTip}" />
+														UseItemPresentation="True" />
 												</DataTemplate>
 											</ItemsRepeater.ItemTemplate>
 										</ItemsRepeater>
diff --git a/src/Files.App.Controls/Sidebar/SidebarView.xaml b/src/Files.App.Controls/Sidebar/SidebarView.xaml
index a42c9eddfad7..f79351d39efa 100644
--- a/src/Files.App.Controls/Sidebar/SidebarView.xaml
+++ b/src/Files.App.Controls/Sidebar/SidebarView.xaml
@@ -4,12 +4,27 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="using:Files.App.Controls"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	HorizontalAlignment="Stretch"
 	Loaded="SidebarView_Loaded"
 	TabFocusNavigation="Local"
 	mc:Ignorable="d">
 
+	<UserControl.Resources>
+		<DataTemplate
+			x:Key="DefaultSidebarItemTemplate"
+			x:DataType="local:FlatSidebarItem">
+			<local:SidebarItem
+				ContentOpacity="{x:Bind RowOpacity}"
+				DataContext="{x:Bind}"
+				Item="{x:Bind Item}"
+				Margin="{x:Bind SectionGapMargin, Mode=OneWay}"
+				NestingLevel="{x:Bind Depth}"
+				UseItemPresentation="True" />
+		</DataTemplate>
+	</UserControl.Resources>
+
 	<Grid>
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition
diff --git a/src/Files.App.Launcher/Files.App.Launcher.vcxproj b/src/Files.App.Launcher/Files.App.Launcher.vcxproj
index 93862737d1f1..65d562e1a2ca 100644
--- a/src/Files.App.Launcher/Files.App.Launcher.vcxproj
+++ b/src/Files.App.Launcher/Files.App.Launcher.vcxproj
@@ -45,7 +45,7 @@
   <PropertyGroup Condition="'$(Configuration)'!='Debug'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <LinkIncremental>false</LinkIncremental>
diff --git a/src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs b/src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs
index 670ff2a7116d..2cae00576d18 100644
--- a/src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs
+++ b/src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs
@@ -37,21 +37,29 @@ public BaseCompressArchiveAction()
 
 		protected void GetDestination(out string[] sources, out string directory, out string fileName)
 		{
-			sources = context.SelectedItems.Select(item => item.ItemPath).ToArray();
+			sources = context.SelectedItems
+				.Select(item => item.GetRequiredPath())
+				.ToArray();
 			directory = string.Empty;
 			fileName = string.Empty;
 
 			if (sources.Length is not 0)
 			{
 				// Get the current directory path
-				directory = context.ShellPage.ShellViewModel.WorkingDirectory.Normalize();
+				var shellPage = context.ShellPage ?? throw new InvalidOperationException("An active shell page is required to compress items.");
+				var shellViewModel = shellPage.GetRequiredShellViewModel();
+				var workingDirectory = shellViewModel.WorkingDirectory
+					?? throw new InvalidOperationException("The active shell page does not have a working directory.");
+				directory = workingDirectory.Normalize();
 
 				// Get the library save folder if the folder is library item
 				if (App.LibraryManager.TryGetLibrary(directory, out var library) && !library.IsEmpty)
-					directory = library.DefaultSaveFolder;
+					directory = library.DefaultSaveFolder
+						?? throw new InvalidOperationException("The library does not have a default save folder.");
 
 				// Gets the file name from the directory path
-				fileName = SystemIO.Path.GetFileName(sources.Length is 1 ? sources[0] : directory);
+				fileName = SystemIO.Path.GetFileName(sources.Length is 1 ? sources[0] : directory)
+					?? throw new InvalidOperationException("The archive destination does not have a file name.");
 			}
 		}
 
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs b/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs
index 0611c69cbccd..19937626b259 100644
--- a/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs
+++ b/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs
@@ -56,13 +56,13 @@ protected async Task DecompressArchiveHereAsync(bool smart = false)
 				return;
 
 			var selectedItems = context.SelectedItems.ToList();
-			var currentFolderPath = context.ShellPage?.ShellViewModel.CurrentFolder?.ItemPath ?? string.Empty;
-			BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(currentFolderPath);
+			var currentFolderPath = context.ShellPage?.ShellViewModel?.CurrentFolder?.ItemPath ?? string.Empty;
+			BaseStorageFolder? currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(currentFolderPath);
 
 			foreach (var selectedItem in selectedItems)
 			{
 				var password = string.Empty;
-				BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
+				BaseStorageFile? archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath!);
 
 				if (archive?.Path is null)
 					return;
@@ -140,7 +140,7 @@ static ReadOnlySpan<char> GetFirstMeaningfulSegment(ReadOnlySpan<char> path)
 				if (smart && currentFolder is not null && isMultipleItems)
 				{
 					destinationFolder =
-						await FilesystemTasks.Wrap(() =>
+						await FilesystemTasks.WrapNullable(() =>
 							currentFolder.CreateFolderAsync(
 								SystemIO.Path.GetFileNameWithoutExtension(archive.Path),
 								CreationCollisionOption.GenerateUniqueName).AsTask());
@@ -152,7 +152,7 @@ await FilesystemTasks.Wrap(() =>
 
 				// Operate decompress
 				var result = await FilesystemTasks.Wrap(() =>
-					StorageArchiveService.DecompressAsync(selectedItem.ItemPath, destinationFolder?.Path ?? string.Empty, password));
+					StorageArchiveService.DecompressAsync(selectedItem.ItemPath!, destinationFolder?.Path ?? string.Empty, password));
 			}
 		}
 
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
index f3bbf4b87eaf..1ca02be16d44 100644
--- a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
+++ b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
@@ -42,7 +42,7 @@ public override async Task ExecuteAsync(object? parameter = null)
 			if (string.IsNullOrEmpty(archivePath))
 				return;
 
-			BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(archivePath);
+			BaseStorageFile? archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(archivePath);
 
 			if (archive?.Path is null)
 				return;
@@ -83,7 +83,7 @@ public override async Task ExecuteAsync(object? parameter = null)
 			if (!StorageHelpers.Exists(archive.Path))
 				return;
 
-			BaseStorageFolder destinationFolder = decompressArchiveViewModel.DestinationFolder;
+			BaseStorageFolder? destinationFolder = decompressArchiveViewModel.DestinationFolder;
 			string destinationFolderPath = decompressArchiveViewModel.DestinationFolderPath;
 
 			// Save extraction location for future use
@@ -91,13 +91,16 @@ public override async Task ExecuteAsync(object? parameter = null)
 
 			if (destinationFolder is null)
 			{
-				BaseStorageFolder parentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(Path.GetDirectoryName(archive.Path) ?? string.Empty);
-				destinationFolder = await FilesystemTasks.Wrap(() => parentFolder.CreateFolderAsync(Path.GetFileName(destinationFolderPath), CreationCollisionOption.GenerateUniqueName).AsTask());
+				BaseStorageFolder? parentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(Path.GetDirectoryName(archive.Path) ?? string.Empty);
+				if (parentFolder is null)
+					throw new InvalidOperationException("The archive's parent folder could not be resolved.");
+
+				destinationFolder = await FilesystemTasks.WrapNullable(() => parentFolder.CreateFolderAsync(Path.GetFileName(destinationFolderPath), CreationCollisionOption.GenerateUniqueName).AsTask());
 			}
 
 			// Operate decompress
 			var result = await FilesystemTasks.Wrap(() =>
-				StorageArchiveService.DecompressAsync(archive?.Path ?? string.Empty, destinationFolder?.Path ?? string.Empty, password, encoding));
+				StorageArchiveService.DecompressAsync(archive.Path, destinationFolder?.Path ?? string.Empty, password, encoding));
 
 			if (decompressArchiveViewModel.OpenDestinationFolderOnCompletion)
 				await NavigationHelpers.OpenPath(destinationFolderPath, context.ShellPage, FilesystemItemType.Directory);
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs
index d3b2d35e290e..f29cb885cfcb 100644
--- a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs
+++ b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs
@@ -34,13 +34,13 @@ public override async Task ExecuteAsync(object? parameter = null)
 			{
 				var password = string.Empty;
 
-				BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
-				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(context.ShellPage?.ShellViewModel.CurrentFolder.ItemPath);
-				BaseStorageFolder destinationFolder = null;
-
+				var archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath!);
+				var currentFolderPath = context.ShellPage?.ShellViewModel?.CurrentFolder?.ItemPath;
 				if (archive?.Path is null)
 					return;
 
+				var currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(currentFolderPath ?? string.Empty);
+
 				if (await FilesystemTasks.Wrap(() => StorageArchiveService.IsEncryptedAsync(archive.Path)))
 				{
 					DecompressArchiveDialog decompressArchiveDialog = new();
@@ -58,15 +58,20 @@ public override async Task ExecuteAsync(object? parameter = null)
 					if (option != ContentDialogResult.Primary)
 						return;
 
-					password = Encoding.UTF8.GetString(decompressArchiveViewModel.Password);
+					password = Encoding.UTF8.GetString(decompressArchiveViewModel.Password!);
 				}
 
+				BaseStorageFolder? destinationFolder = null;
 				if (currentFolder is not null)
-					destinationFolder = await FilesystemTasks.Wrap(() => currentFolder.CreateFolderAsync(SystemIO.Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.GenerateUniqueName).AsTask());
+				{
+					var destinationResult = await FilesystemTasks.WrapNullable(() =>
+						currentFolder.CreateFolderAsync(SystemIO.Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.GenerateUniqueName).AsTask());
+					destinationFolder = destinationResult.Result;
+				}
 
 				// Operate decompress
-				var result = await FilesystemTasks.Wrap(() =>
-					StorageArchiveService.DecompressAsync(selectedItem.ItemPath, destinationFolder?.Path ?? string.Empty, password));
+				await FilesystemTasks.Wrap(() =>
+					StorageArchiveService.DecompressAsync(selectedItem.ItemPath!, destinationFolder?.Path ?? string.Empty, password));
 			}
 		}
 
diff --git a/src/Files.App/Actions/Content/Background/SetAsAppBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsAppBackgroundAction.cs
index cc7befc03e77..f5252e9b8d5a 100644
--- a/src/Files.App/Actions/Content/Background/SetAsAppBackgroundAction.cs
+++ b/src/Files.App/Actions/Content/Background/SetAsAppBackgroundAction.cs
@@ -30,7 +30,7 @@ public override RichGlyph Glyph
 		public override Task ExecuteAsync(object? parameter = null)
 		{
 			if (IsExecutable && ContentPageContext.SelectedItem is ListedItem selectedItem)
-				AppearanceSettingsService.AppThemeBackgroundImageSource = selectedItem.ItemPath;
+				AppearanceSettingsService.AppThemeBackgroundImageSource = selectedItem.ItemPath!;
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Content/Background/SetAsLockscreenBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsLockscreenBackgroundAction.cs
index 8be0debcbaf4..40ca15248438 100644
--- a/src/Files.App/Actions/Content/Background/SetAsLockscreenBackgroundAction.cs
+++ b/src/Files.App/Actions/Content/Background/SetAsLockscreenBackgroundAction.cs
@@ -32,7 +32,7 @@ public override Task ExecuteAsync(object? parameter = null)
 
 			try
 			{
-				return WindowsWallpaperService.SetLockScreenWallpaper(selectedItem.ItemPath);
+				return WindowsWallpaperService.SetLockScreenWallpaper(selectedItem.ItemPath!);
 			}
 			catch (Exception ex)
 			{
diff --git a/src/Files.App/Actions/Content/Background/SetAsSlideshowBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsSlideshowBackgroundAction.cs
index 2b94f70da257..ba691079053a 100644
--- a/src/Files.App/Actions/Content/Background/SetAsSlideshowBackgroundAction.cs
+++ b/src/Files.App/Actions/Content/Background/SetAsSlideshowBackgroundAction.cs
@@ -24,7 +24,7 @@ public override RichGlyph Glyph
 
 		public override Task ExecuteAsync(object? parameter = null)
 		{
-			if (!IsExecutable || ContentPageContext.SelectedItems.Select(item => item.ItemPath).ToArray() is not string[] paths || paths.Length is 0)
+			if (!IsExecutable || ContentPageContext.SelectedItems.Select(item => item.ItemPath!).ToArray() is not string[] paths || paths.Length is 0)
 				return Task.CompletedTask;
 
 			try
diff --git a/src/Files.App/Actions/Content/Background/SetAsWallpaperBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsWallpaperBackgroundAction.cs
index 9d8e09608009..5689db08f96c 100644
--- a/src/Files.App/Actions/Content/Background/SetAsWallpaperBackgroundAction.cs
+++ b/src/Files.App/Actions/Content/Background/SetAsWallpaperBackgroundAction.cs
@@ -32,7 +32,7 @@ public override Task ExecuteAsync(object? parameter = null)
 
 			try
 			{
-				WindowsWallpaperService.SetDesktopWallpaper(selectedItem.ItemPath);
+				WindowsWallpaperService.SetDesktopWallpaper(selectedItem.ItemPath!);
 			}
 			catch (Exception ex)
 			{
diff --git a/src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs b/src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs
index 84ef8d6a0723..68f0f45f2e0a 100644
--- a/src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs
+++ b/src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs
@@ -43,7 +43,7 @@ public BaseRotateAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
-			await Task.WhenAll(context.SelectedItems.Select(image => BitmapHelper.RotateAsync(PathNormalization.NormalizePath(image.ItemPath), Rotation)));
+			await Task.WhenAll(context.SelectedItems.Select(image => BitmapHelper.RotateAsync(PathNormalization.NormalizePath(image.ItemPath!), Rotation)));
 
 			context.ShellPage?.SlimContentPage?.ItemManipulationModel?.RefreshItemsThumbnail();
 
diff --git a/src/Files.App/Actions/Content/Install/InstallFontAction.cs b/src/Files.App/Actions/Content/Install/InstallFontAction.cs
index 31b5f4aeaed6..a327147056ae 100644
--- a/src/Files.App/Actions/Content/Install/InstallFontAction.cs
+++ b/src/Files.App/Actions/Content/Install/InstallFontAction.cs
@@ -38,17 +38,18 @@ public InstallFontAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
-			if (context?.ShellPage?.ShellViewModel.WorkingDirectory is null)
+			if (context.ShellPage?.ShellViewModel?.WorkingDirectory is not { } workingDirectory)
 				return;
 
-			var banner = StatusCenterHelper.AddCard_InstallFont(context.ShellPage.ShellViewModel.WorkingDirectory.CreateEnumerable(), ReturnResult.InProgress, context.SelectedItems.Count);
+			var banner = StatusCenterHelper.AddCard_InstallFont(workingDirectory.CreateEnumerable(), ReturnResult.InProgress, context.SelectedItems.Count);
 			banner.IsCancelable = false;
 
-			var paths = context.SelectedItems.Select(item => item.ItemPath).ToArray();
+			var paths = context.SelectedItems.Select(item => item.ItemPath!).ToArray();
 			await Win32Helper.InstallFontsAsync(paths, false);
 
 			StatusCenterViewModel.RemoveItem(banner);
-			StatusCenterHelper.AddCard_InstallFont(context.ShellPage.ShellViewModel.WorkingDirectory.CreateEnumerable(), ReturnResult.Success, context.SelectedItems.Count);
+			var currentWorkingDirectory = context.ShellPage.GetRequiredShellViewModel().WorkingDirectory!;
+			StatusCenterHelper.AddCard_InstallFont(currentWorkingDirectory.CreateEnumerable(), ReturnResult.Success, context.SelectedItems.Count);
 		}
 
 		public void Context_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Content/Selection/SelectAllAction.cs b/src/Files.App/Actions/Content/Selection/SelectAllAction.cs
index 142d675fcb20..924b4835a5e9 100644
--- a/src/Files.App/Actions/Content/Selection/SelectAllAction.cs
+++ b/src/Files.App/Actions/Content/Selection/SelectAllAction.cs
@@ -34,7 +34,8 @@ public bool IsExecutable
 				if (page is null)
 					return false;
 
-				int itemCount = page.ShellViewModel.FilesAndFolders.Count;
+				var shellViewModel = page.GetRequiredShellViewModel();
+				int itemCount = shellViewModel.FilesAndFolders.Count;
 				int selectedItemCount = context.SelectedItems.Count;
 				if (itemCount == selectedItemCount)
 					return false;
diff --git a/src/Files.App/Actions/Content/Tags/RemoveTagsAction.cs b/src/Files.App/Actions/Content/Tags/RemoveTagsAction.cs
index 26646ddd889d..737d35f9c1d2 100644
--- a/src/Files.App/Actions/Content/Tags/RemoveTagsAction.cs
+++ b/src/Files.App/Actions/Content/Tags/RemoveTagsAction.cs
@@ -33,9 +33,10 @@ public RemoveTagsAction()
 		public async Task ExecuteAsync(object? parameter = null)
 		{
 			if (await FileTagsHelper.RemoveTagsAsync(context.SelectedItems) &&
-				context.ShellPage is not null)
+				context.ShellPage is { } shellPage)
 			{
-				await context.ShellPage.ShellViewModel.RefreshTagGroups();
+				var shellViewModel = shellPage.GetRequiredShellViewModel();
+				await shellViewModel.RefreshTagGroups();
 			}
 		}
 
diff --git a/src/Files.App/Actions/FileSystem/BaseDeleteAction.cs b/src/Files.App/Actions/FileSystem/BaseDeleteAction.cs
index d4d64e52ad1d..f7664d02af5b 100644
--- a/src/Files.App/Actions/FileSystem/BaseDeleteAction.cs
+++ b/src/Files.App/Actions/FileSystem/BaseDeleteAction.cs
@@ -32,15 +32,16 @@ protected async Task DeleteItemsAsync(bool permanently)
 			var items =
 				context.SelectedItems.Select(item =>
 					StorageHelpers.FromPathAndType(
-						item.ItemPath,
+						item.GetRequiredPath(),
 						item.PrimaryItemAttribute is StorageItemTypes.File
 							? FilesystemItemType.File
 							: FilesystemItemType.Directory));
 
-			if (context.ShellPage is IShellPage shellPage)
+			if (context.ShellPage is { } shellPage)
 			{
 				await shellPage.FilesystemHelpers.DeleteItemsAsync(items, settings.DeleteConfirmationPolicy, permanently, true);
-				await shellPage.ShellViewModel.ApplyFilesAndFoldersChangesAsync();
+				var shellViewModel = shellPage.GetRequiredShellViewModel();
+				await shellViewModel.ApplyFilesAndFoldersChangesAsync();
 			}
 		}
 
diff --git a/src/Files.App/Actions/FileSystem/CopyItemPathAction.cs b/src/Files.App/Actions/FileSystem/CopyItemPathAction.cs
index 1093989f0dcc..91000b896250 100644
--- a/src/Files.App/Actions/FileSystem/CopyItemPathAction.cs
+++ b/src/Files.App/Actions/FileSystem/CopyItemPathAction.cs
@@ -35,11 +35,11 @@ public CopyItemPathAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage?.SlimContentPage is not null)
+			if (context.ShellPage is { SlimContentPage: { } contentPage } shellPage)
 			{
-				var path = context.ShellPage.SlimContentPage.SelectedItems is not null
-				? context.ShellPage.SlimContentPage.SelectedItems.Select(x => x.ItemPath).Aggregate((accum, current) => accum + "\n" + current)
-				: context.ShellPage.ShellViewModel.WorkingDirectory;
+				var path = contentPage.SelectedItems is not null
+					? contentPage.SelectedItems.Select(x => x.ItemPath).Aggregate((accum, current) => accum + "\n" + current)
+					: shellPage.GetRequiredShellViewModel().WorkingDirectory;
 
 				if (FtpHelpers.IsFtpPath(path))
 					path = path.Replace('\\', '/');
@@ -47,7 +47,7 @@ public Task ExecuteAsync(object? parameter = null)
 				SafetyExtensions.IgnoreExceptions(() =>
 				{
 					DataPackage data = new();
-					data.SetText(path);
+					data.SetText(path!);
 
 					Clipboard.SetContent(data);
 					Clipboard.Flush();
diff --git a/src/Files.App/Actions/FileSystem/CopyItemPathWithQuotesAction.cs b/src/Files.App/Actions/FileSystem/CopyItemPathWithQuotesAction.cs
index 2d6374e43b69..c309e6e64d0e 100644
--- a/src/Files.App/Actions/FileSystem/CopyItemPathWithQuotesAction.cs
+++ b/src/Files.App/Actions/FileSystem/CopyItemPathWithQuotesAction.cs
@@ -35,12 +35,11 @@ public CopyItemPathWithQuotesAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage?.SlimContentPage is not null)
+			if (context.ShellPage is { SlimContentPage: { } contentPage } shellPage)
 			{
-				var selectedItems = context.ShellPage.SlimContentPage.SelectedItems;
-				var path = selectedItems is not null
-					? string.Join("\n", selectedItems.Select(item => $"\"{item.ItemPath}\""))
-					: context.ShellPage.ShellViewModel.WorkingDirectory;
+				var path = contentPage.SelectedItems is not null
+					? string.Join("\n", contentPage.SelectedItems.Select(item => $"\"{item.ItemPath}\""))
+					: shellPage.GetRequiredShellViewModel().WorkingDirectory;
 
 				if (FtpHelpers.IsFtpPath(path))
 					path = path.Replace('\\', '/');
@@ -48,7 +47,7 @@ public Task ExecuteAsync(object? parameter = null)
 				SafetyExtensions.IgnoreExceptions(() =>
 				{
 					DataPackage data = new();
-					data.SetText(path);
+					data.SetText(path!);
 
 					Clipboard.SetContent(data);
 					Clipboard.Flush();
diff --git a/src/Files.App/Actions/FileSystem/CopyPathAction.cs b/src/Files.App/Actions/FileSystem/CopyPathAction.cs
index c1d1cf13b256..40b6df603fda 100644
--- a/src/Files.App/Actions/FileSystem/CopyPathAction.cs
+++ b/src/Files.App/Actions/FileSystem/CopyPathAction.cs
@@ -35,9 +35,9 @@ public CopyPathAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage?.SlimContentPage is not null)
+			if (context.ShellPage is { SlimContentPage: not null } shellPage)
 			{
-				var path = context.ShellPage.ShellViewModel.WorkingDirectory;
+				var path = shellPage.GetRequiredShellViewModel().WorkingDirectory;
 
 				if (FtpHelpers.IsFtpPath(path))
 					path = path.Replace('\\', '/');
@@ -45,7 +45,7 @@ public Task ExecuteAsync(object? parameter = null)
 				SafetyExtensions.IgnoreExceptions(() =>
 				{
 					DataPackage data = new();
-					data.SetText(path);
+					data.SetText(path!);
 
 					Clipboard.SetContent(data);
 					Clipboard.Flush();
diff --git a/src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs b/src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs
index e6da45c48893..3deb1b651f1a 100644
--- a/src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs
+++ b/src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs
@@ -35,9 +35,9 @@ public CopyPathWithQuotesAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage?.SlimContentPage is not null)
+			if (context.ShellPage is { SlimContentPage: not null } shellPage)
 			{
-				var path = "\"" + context.ShellPage.ShellViewModel.WorkingDirectory + "\"";
+				var path = "\"" + shellPage.GetRequiredShellViewModel().WorkingDirectory + "\"";
 
 				if (FtpHelpers.IsFtpPath(path))
 					path = path.Replace('\\', '/');
diff --git a/src/Files.App/Actions/FileSystem/CreateAlternateDataStreamAction.cs b/src/Files.App/Actions/FileSystem/CreateAlternateDataStreamAction.cs
index 749e0e9c3199..0c9730fbd6c6 100644
--- a/src/Files.App/Actions/FileSystem/CreateAlternateDataStreamAction.cs
+++ b/src/Files.App/Actions/FileSystem/CreateAlternateDataStreamAction.cs
@@ -49,14 +49,15 @@ public async Task ExecuteAsync(object? parameter = null)
 			var userInput = nameDialog.ViewModel.AdditionalData as string;
 			await Task.WhenAll(context.SelectedItems.Select(async selectedItem =>
 			{
-				var isDateOk = Win32Helper.GetFileDateModified(selectedItem.ItemPath, out var dateModified);
-				var isReadOnly = Win32Helper.HasFileAttribute(selectedItem.ItemPath, System.IO.FileAttributes.ReadOnly);
+				var itemPath = selectedItem.ItemPath!;
+				var isDateOk = Win32Helper.GetFileDateModified(itemPath, out var dateModified);
+				var isReadOnly = Win32Helper.HasFileAttribute(itemPath, System.IO.FileAttributes.ReadOnly);
 
 				// Unset read-only attribute (#7534)
 				if (isReadOnly)
-					Win32Helper.UnsetFileAttribute(selectedItem.ItemPath, System.IO.FileAttributes.ReadOnly);
+					Win32Helper.UnsetFileAttribute(itemPath, System.IO.FileAttributes.ReadOnly);
 
-				if (!Win32Helper.WriteStringToFile($"{selectedItem.ItemPath}:{userInput}", ""))
+				if (!Win32Helper.WriteStringToFile($"{itemPath}:{userInput}", ""))
 				{
 					var dialog = new ContentDialog
 					{
@@ -73,11 +74,11 @@ await Task.WhenAll(context.SelectedItems.Select(async selectedItem =>
 
 				// Restore read-only attribute (#7534)
 				if (isReadOnly)
-					Win32Helper.SetFileAttribute(selectedItem.ItemPath, System.IO.FileAttributes.ReadOnly);
+					Win32Helper.SetFileAttribute(itemPath, System.IO.FileAttributes.ReadOnly);
 
 				// Restore date modified
 				if (isDateOk)
-					Win32Helper.SetFileDateModified(selectedItem.ItemPath, dateModified);
+					Win32Helper.SetFileDateModified(itemPath, dateModified);
 			}));
 
 			if (context.ShellPage is null)
diff --git a/src/Files.App/Actions/FileSystem/DeleteItemAction.cs b/src/Files.App/Actions/FileSystem/DeleteItemAction.cs
index a97514bd4a77..6e5071601bcf 100644
--- a/src/Files.App/Actions/FileSystem/DeleteItemAction.cs
+++ b/src/Files.App/Actions/FileSystem/DeleteItemAction.cs
@@ -12,7 +12,7 @@ public string Label
 		public string Description
 			=> Strings.DeleteItemDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
-		public ActionCategory Category
+		public override ActionCategory Category
 			=> ActionCategory.FileSystem;
 
 		public RichGlyph Glyph
diff --git a/src/Files.App/Actions/FileSystem/DeleteItemPermanentlyAction.cs b/src/Files.App/Actions/FileSystem/DeleteItemPermanentlyAction.cs
index a7d1845da3d0..9ddd3185f320 100644
--- a/src/Files.App/Actions/FileSystem/DeleteItemPermanentlyAction.cs
+++ b/src/Files.App/Actions/FileSystem/DeleteItemPermanentlyAction.cs
@@ -12,7 +12,7 @@ public string Label
 		public string Description
 			=> Strings.DeleteItemPermanentlyDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
 
-		public ActionCategory Category
+		public override ActionCategory Category
 			=> ActionCategory.FileSystem;
 
 		public string AccessKey
diff --git a/src/Files.App/Actions/FileSystem/FlattenFolderAction.cs b/src/Files.App/Actions/FileSystem/FlattenFolderAction.cs
index 7027d201e3f7..13bd5d880c94 100644
--- a/src/Files.App/Actions/FileSystem/FlattenFolderAction.cs
+++ b/src/Files.App/Actions/FileSystem/FlattenFolderAction.cs
@@ -64,7 +64,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			if (result != ContentDialogResult.Primary)
 				return;
 
-			FlattenFolder(context.SelectedItem.ItemPath);
+			FlattenFolder(context.SelectedItem.ItemPath!);
 		}
 
 		private void FlattenFolder(string path)
diff --git a/src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs b/src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs
index e39ad4fc9c51..5113fc06975e 100644
--- a/src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs
+++ b/src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs
@@ -36,7 +36,7 @@ public OpenFileLocationAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage?.ShellViewModel is null)
+			if (context.ShellPage?.ShellViewModel is not { } shellViewModel)
 				return;
 
 			var item = context.SelectedItem as IShortcutItem;
@@ -46,15 +46,20 @@ public async Task ExecuteAsync(object? parameter = null)
 
 			// Check if destination path exists
 			var folderPath = Path.GetDirectoryName(item.TargetPath);
-			var destFolder = await context.ShellPage.ShellViewModel.GetFolderWithPathFromPathAsync(folderPath);
+			FilesystemResult<StorageFolderWithPath> destFolder = folderPath is null
+				? new(null, FileSystemStatusCode.Generic)
+				: await shellViewModel.GetFolderWithPathFromPathAsync(folderPath);
 
 			if (destFolder)
 			{
-				context.ShellPage?.NavigateWithArguments(context.ShellPage.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
+				if (context.ShellPage is not { } shellPage)
+					return;
+
+				shellPage.NavigateWithArguments(shellPage.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
 				{
 					NavPathParam = folderPath,
-					SelectItems = [Path.GetFileName(item.TargetPath.TrimPath())],
-					AssociatedTabInstance = context.ShellPage
+					SelectItems = [Path.GetFileName(item.TargetPath.TrimPath())!],
+					AssociatedTabInstance = shellPage
 				});
 			}
 			else if (destFolder == FileSystemStatusCode.NotFound)
diff --git a/src/Files.App/Actions/FileSystem/OpenItemAction.cs b/src/Files.App/Actions/FileSystem/OpenItemAction.cs
index 6504218185d1..13e0f9db796f 100644
--- a/src/Files.App/Actions/FileSystem/OpenItemAction.cs
+++ b/src/Files.App/Actions/FileSystem/OpenItemAction.cs
@@ -137,7 +137,7 @@ public async Task ExecuteAsync(object? parameter = null)
 				return;
 
 			var item = context.SelectedItem;
-			var folderPath = Path.GetDirectoryName(item?.ItemPath.TrimEnd('\\'));
+			var folderPath = Path.GetDirectoryName(item?.ItemPath!.TrimEnd('\\'));
 
 			if (folderPath is null || item is null)
 				return;
@@ -145,7 +145,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			context.ShellPage.NavigateWithArguments(context.ShellPage.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
 			{
 				NavPathParam = folderPath,
-				SelectItems = [item.ItemNameRaw],
+				SelectItems = [item.ItemNameRaw!],
 				AssociatedTabInstance = context.ShellPage
 			});
 		}
diff --git a/src/Files.App/Actions/FileSystem/PasteItemAction.cs b/src/Files.App/Actions/FileSystem/PasteItemAction.cs
index 5610db6994b9..f7c5079e0713 100644
--- a/src/Files.App/Actions/FileSystem/PasteItemAction.cs
+++ b/src/Files.App/Actions/FileSystem/PasteItemAction.cs
@@ -42,11 +42,12 @@ public PasteItemAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage is null)
+			if (context.ShellPage is not { } shellPage)
 				return;
 
-			string path = context.ShellPage.ShellViewModel.WorkingDirectory;
-			await UIFilesystemHelpers.PasteItemAsync(path, context.ShellPage);
+			var shellViewModel = shellPage.GetRequiredShellViewModel();
+			string path = shellViewModel.WorkingDirectory!;
+			await UIFilesystemHelpers.PasteItemAsync(path, shellPage);
 		}
 
 		public bool GetIsExecutable()
diff --git a/src/Files.App/Actions/FileSystem/PasteItemAsShortcutAction.cs b/src/Files.App/Actions/FileSystem/PasteItemAsShortcutAction.cs
index 15729fe5de36..7cfcc9f47adb 100644
--- a/src/Files.App/Actions/FileSystem/PasteItemAsShortcutAction.cs
+++ b/src/Files.App/Actions/FileSystem/PasteItemAsShortcutAction.cs
@@ -33,11 +33,12 @@ public PasteItemAsShortcutAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage is null)
+			if (context.ShellPage is not { } shellPage)
 				return Task.CompletedTask;
 
-			string path = context.ShellPage.ShellViewModel.WorkingDirectory;
-			return UIFilesystemHelpers.PasteItemAsShortcutAsync(path, context.ShellPage);
+			var shellViewModel = shellPage.GetRequiredShellViewModel();
+			string path = shellViewModel.WorkingDirectory!;
+			return UIFilesystemHelpers.PasteItemAsShortcutAsync(path, shellPage);
 		}
 
 		public bool GetIsExecutable()
diff --git a/src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs b/src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs
index e91afce97763..7862e5e88399 100644
--- a/src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs
+++ b/src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs
@@ -39,14 +39,16 @@ public PasteItemToSelectionAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage is null)
+			if (context.ShellPage is not { } shellPage)
 				return;
 
-			string path = context.SelectedItem is ListedItem selectedItem
+			string? path = context.SelectedItem is ListedItem selectedItem
 				? selectedItem.ItemPath
-				: context.ShellPage.ShellViewModel.WorkingDirectory;
+				: shellPage.ShellViewModel?.WorkingDirectory;
+			if (path is null)
+				return;
 
-			await UIFilesystemHelpers.PasteItemAsync(path, context.ShellPage);
+			await UIFilesystemHelpers.PasteItemAsync(path, shellPage);
 		}
 
 		public bool GetIsExecutable()
diff --git a/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs b/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs
index 970501c97cbf..1e8a6ed5df67 100644
--- a/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs
+++ b/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs
@@ -58,9 +58,9 @@ public async Task ExecuteAsync(object? parameter = null)
 			var items = context.SelectedItems.ToList().Where(x => x is RecycleBinItem).Select((item) => new
 			{
 				Source = StorageHelpers.FromPathAndType(
-					item.ItemPath,
+					item.GetRequiredPath(),
 					item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory),
-				Dest = ((RecycleBinItem)item).ItemOriginalPath
+				Dest = ((RecycleBinItem)item).ItemOriginalPath!
 			});
 
 			await context.ShellPage!.FilesystemHelpers.RestoreItemsFromTrashAsync(items.Select(x => x.Source), items.Select(x => x.Dest), true);
diff --git a/src/Files.App/Actions/Git/GitCloneAction.cs b/src/Files.App/Actions/Git/GitCloneAction.cs
index 7db6d6fae71a..d3c19cc8ac16 100644
--- a/src/Files.App/Actions/Git/GitCloneAction.cs
+++ b/src/Files.App/Actions/Git/GitCloneAction.cs
@@ -29,11 +29,12 @@ public GitCloneAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			if (pageContext.ShellPage is null)
+			if (pageContext.ShellPage is not { } shellPage)
 				return Task.CompletedTask;
 
+			var shellViewModel = shellPage.GetRequiredShellViewModel();
 			var repoUrl = parameter?.ToString() ?? string.Empty;
-			var viewModel = new CloneRepoDialogViewModel(repoUrl, pageContext.ShellPage.ShellViewModel.WorkingDirectory);
+			var viewModel = new CloneRepoDialogViewModel(repoUrl, shellViewModel.WorkingDirectory!);
 			return dialogService.ShowDialogAsync(viewModel);
 		}
 
diff --git a/src/Files.App/Actions/Global/RedoAction.cs b/src/Files.App/Actions/Global/RedoAction.cs
index d61a35bcc7c9..ec78631bdc65 100644
--- a/src/Files.App/Actions/Global/RedoAction.cs
+++ b/src/Files.App/Actions/Global/RedoAction.cs
@@ -33,7 +33,7 @@ public RedoAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			return context.ShellPage!.StorageHistoryHelpers.TryRedo();
+			return context.ShellPage?.StorageHistoryHelpers.TryRedo() ?? Task.CompletedTask;
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Global/UndoAction.cs b/src/Files.App/Actions/Global/UndoAction.cs
index f12421cf7692..5d2860dfa710 100644
--- a/src/Files.App/Actions/Global/UndoAction.cs
+++ b/src/Files.App/Actions/Global/UndoAction.cs
@@ -33,7 +33,7 @@ public UndoAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			return context.ShellPage.StorageHistoryHelpers.TryUndo();
+			return context.ShellPage?.StorageHistoryHelpers.TryUndo() ?? Task.CompletedTask;
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Navigation/ArrangePanesHorizontallyAction.cs b/src/Files.App/Actions/Navigation/ArrangePanesHorizontallyAction.cs
index 92e8eaad063d..311fdbfa9e50 100644
--- a/src/Files.App/Actions/Navigation/ArrangePanesHorizontallyAction.cs
+++ b/src/Files.App/Actions/Navigation/ArrangePanesHorizontallyAction.cs
@@ -36,7 +36,8 @@ public ArrangePanesHorizontallyAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			ContentPageContext.ShellPage!.PaneHolder.ArrangePanes(ShellPaneArrangement.Horizontal);
+			var paneHolder = ContentPageContext.ShellPage.GetRequiredPaneHolder();
+			paneHolder.ArrangePanes(ShellPaneArrangement.Horizontal);
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Navigation/ArrangePanesVerticallyAction.cs b/src/Files.App/Actions/Navigation/ArrangePanesVerticallyAction.cs
index 49251e87d581..01db9c18d70c 100644
--- a/src/Files.App/Actions/Navigation/ArrangePanesVerticallyAction.cs
+++ b/src/Files.App/Actions/Navigation/ArrangePanesVerticallyAction.cs
@@ -36,7 +36,8 @@ public ArrangePanesVerticallyAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			ContentPageContext.ShellPage!.PaneHolder.ArrangePanes(ShellPaneArrangement.Vertical);
+			var paneHolder = ContentPageContext.ShellPage.GetRequiredPaneHolder();
+			paneHolder.ArrangePanes(ShellPaneArrangement.Vertical);
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Navigation/CloseActivePaneAction.cs b/src/Files.App/Actions/Navigation/CloseActivePaneAction.cs
index 08bd7d9c5f81..fe1e9d481173 100644
--- a/src/Files.App/Actions/Navigation/CloseActivePaneAction.cs
+++ b/src/Files.App/Actions/Navigation/CloseActivePaneAction.cs
@@ -33,7 +33,11 @@ public CloseActivePaneAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			ContentPageContext.ShellPage?.PaneHolder.CloseActivePane();
+			if (ContentPageContext.ShellPage is not { } shellPage)
+				return Task.CompletedTask;
+
+			var paneHolder = shellPage.GetRequiredPaneHolder();
+			paneHolder.CloseActivePane();
 			return Task.CompletedTask;
 		}
 
diff --git a/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs b/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs
index efa757d56554..ec52614a5286 100644
--- a/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs
+++ b/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs
@@ -18,7 +18,7 @@ public CloseOtherTabsSelectedAction()
 
 		public override Task ExecuteAsync(object? parameter = null)
 		{
-			MultitaskingTabsHelpers.CloseOtherTabs(context.SelectedTabItem, context.Control!);
+			MultitaskingTabsHelpers.CloseOtherTabs(context.SelectedTabItem, context.Control);
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs b/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs
index 4ca4e35a9fa4..868c6e908266 100644
--- a/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs
+++ b/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs
@@ -18,7 +18,7 @@ public CloseTabsToTheLeftSelectedAction()
 
 		public override Task ExecuteAsync(object? parameter = null)
 		{
-			MultitaskingTabsHelpers.CloseTabsToTheLeft(context.SelectedTabItem, context.Control!);
+			MultitaskingTabsHelpers.CloseTabsToTheLeft(context.SelectedTabItem, context.Control);
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs b/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs
index a49b56b93d8d..0c7ecdb80d0a 100644
--- a/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs
+++ b/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs
@@ -18,7 +18,7 @@ public CloseTabsToTheRightSelectedAction()
 
 		public override Task ExecuteAsync(object? parameter = null)
 		{
-			MultitaskingTabsHelpers.CloseTabsToTheRight(context.SelectedTabItem, context.Control!);
+			MultitaskingTabsHelpers.CloseTabsToTheRight(context.SelectedTabItem, context.Control);
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Navigation/DuplicateSelectedTabAction.cs b/src/Files.App/Actions/Navigation/DuplicateSelectedTabAction.cs
index 550e2d16e798..13abc3e831c2 100644
--- a/src/Files.App/Actions/Navigation/DuplicateSelectedTabAction.cs
+++ b/src/Files.App/Actions/Navigation/DuplicateSelectedTabAction.cs
@@ -31,7 +31,8 @@ public DuplicateSelectedTabAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
-			var arguments = context.SelectedTabItem.NavigationParameter;
+			var selectedTabItem = context.SelectedTabItem ?? throw new InvalidOperationException("A selected tab is required to duplicate a tab.");
+			var arguments = selectedTabItem.NavigationParameter;
 
 			if (arguments is null)
 			{
diff --git a/src/Files.App/Actions/Navigation/FocusOtherPane.cs b/src/Files.App/Actions/Navigation/FocusOtherPane.cs
index 1dfeebde9c9d..1e1c403f8d5a 100644
--- a/src/Files.App/Actions/Navigation/FocusOtherPane.cs
+++ b/src/Files.App/Actions/Navigation/FocusOtherPane.cs
@@ -32,7 +32,8 @@ public FocusOtherPaneAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			context.ShellPage!.PaneHolder.FocusOtherPane();
+			var paneHolder = context.ShellPage.GetRequiredPaneHolder();
+			paneHolder.FocusOtherPane();
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Navigation/NextTabAction.cs b/src/Files.App/Actions/Navigation/NextTabAction.cs
index 585169ff3c2b..980bc29dc557 100644
--- a/src/Files.App/Actions/Navigation/NextTabAction.cs
+++ b/src/Files.App/Actions/Navigation/NextTabAction.cs
@@ -42,7 +42,8 @@ public async Task ExecuteAsync(object? parameter = null)
 			await Task.Delay(500);
 
 			// Focus the content of the selected tab item (needed for keyboard navigation)
-			contentPageContext.ShellPage!.PaneHolder.FocusActivePane();
+			var paneHolder = contentPageContext.ShellPage.GetRequiredPaneHolder();
+			paneHolder.FocusActivePane();
 		}
 
 		private void MultitaskingContext_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Navigation/OpenInNewPane/BaseOpenInNewPaneAction.cs b/src/Files.App/Actions/Navigation/OpenInNewPane/BaseOpenInNewPaneAction.cs
index fa92bbae1581..af7457cba93b 100644
--- a/src/Files.App/Actions/Navigation/OpenInNewPane/BaseOpenInNewPaneAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInNewPane/BaseOpenInNewPaneAction.cs
@@ -36,9 +36,13 @@ public BaseOpenInNewPaneAction()
 
 		public virtual Task ExecuteAsync(object? parameter = null)
 		{
+			if (ContentPageContext.ShellPage is not { } shellPage ||
+				shellPage.SlimContentPage?.SelectedItems?.FirstOrDefault() is not { } selectedItem)
+				return Task.CompletedTask;
+
 			NavigationHelpers.OpenInSecondaryPane(
-				ContentPageContext.ShellPage,
-				ContentPageContext.ShellPage.SlimContentPage.SelectedItems.FirstOrDefault(),
+				shellPage,
+				selectedItem,
 				parameter as ShellPaneArrangement? ?? ShellPaneArrangement.None);
 
 			return Task.CompletedTask;
diff --git a/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromSidebarAction.cs
index 450f1733b157..5c383bdb3ff7 100644
--- a/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromSidebarAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromSidebarAction.cs
@@ -8,8 +8,8 @@ internal sealed partial class OpenInNewPaneFromSidebarAction : BaseOpenInNewPane
 	{
 		public override bool IsExecutable =>
 			SidebarContext.IsItemRightClicked &&
-			SidebarContext.RightClickedItem is not null &&
-			SidebarContext.RightClickedItem.MenuOptions.IsLocationItem &&
+			SidebarContext.RightClickedItem is { } item &&
+			item.MenuOptions!.IsLocationItem &&
 			ContentPageContext.IsMultiPaneAvailable &&
 			!ContentPageContext.IsMultiPaneActive;
 
diff --git a/src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs b/src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs
index 0d0f3743f7e2..0ee9e2803796 100644
--- a/src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs
@@ -44,9 +44,11 @@ public virtual async Task ExecuteAsync(object? parameter = null)
 			{
 				await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				{
+					var targetPath = (listedItem as IShortcutItem)?.TargetPath;
+					var path = !string.IsNullOrEmpty(targetPath) ? targetPath : listedItem.GetRequiredPath();
 					await NavigationHelpers.AddNewTabByPathAsync(
 						typeof(ShellPanesPage),
-						(listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath,
+						path,
 						false);
 				},
 				Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
diff --git a/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs
index e9bf87960abe..7e1d1b7378e4 100644
--- a/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs
@@ -8,8 +8,8 @@ internal sealed partial class OpenInNewTabFromSidebarAction : BaseOpenInNewTabAc
 	{
 		public override bool IsExecutable =>
 			SidebarContext.IsItemRightClicked &&
-			SidebarContext.RightClickedItem is not null &&
-			SidebarContext.RightClickedItem.MenuOptions.IsLocationItem;
+			SidebarContext.RightClickedItem is { } item &&
+			item.MenuOptions!.IsLocationItem;
 
 		public override bool IsAccessibleGlobally
 			=> false;
diff --git a/src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs b/src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs
index 299be266b895..f980b655d833 100644
--- a/src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs
@@ -52,7 +52,8 @@ public virtual async Task ExecuteAsync(object? parameter = null)
 
 			foreach (ListedItem listedItem in items)
 			{
-				var selectedItemPath = (listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath;
+				var targetPath = (listedItem as IShortcutItem)?.TargetPath;
+				var selectedItemPath = !string.IsNullOrEmpty(targetPath) ? targetPath : listedItem.GetRequiredPath();
 				var folderUri = new Uri($"files-dev:?folder={@selectedItemPath}");
 
 				await Launcher.LaunchUriAsync(folderUri);
diff --git a/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromSidebarAction.cs
index 9bb54c1b2090..b5973befc97a 100644
--- a/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromSidebarAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromSidebarAction.cs
@@ -11,8 +11,8 @@ public override HotKey HotKey
 
 		public override bool IsExecutable =>
 			SidebarContext.IsItemRightClicked &&
-			SidebarContext.RightClickedItem is not null &&
-			SidebarContext.RightClickedItem.MenuOptions.IsLocationItem;
+			SidebarContext.RightClickedItem is { } item &&
+			item.MenuOptions!.IsLocationItem;
 
 		public override bool IsAccessibleGlobally
 			=> false;
diff --git a/src/Files.App/Actions/Navigation/OpenInOtherPane/BaseOpenInOtherPaneAction.cs b/src/Files.App/Actions/Navigation/OpenInOtherPane/BaseOpenInOtherPaneAction.cs
index 8e26d30a0c72..2af86f85589d 100644
--- a/src/Files.App/Actions/Navigation/OpenInOtherPane/BaseOpenInOtherPaneAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInOtherPane/BaseOpenInOtherPaneAction.cs
@@ -39,7 +39,8 @@ public virtual Task ExecuteAsync(object? parameter = null)
 			if (selectedItem is null)
 				return Task.CompletedTask;
 
-			var path = (selectedItem as IShortcutItem)?.TargetPath ?? selectedItem.ItemPath;
+			var targetPath = (selectedItem as IShortcutItem)?.TargetPath;
+			var path = !string.IsNullOrEmpty(targetPath) ? targetPath : selectedItem.GetRequiredPath();
 			ContentPageContext.ShellPage?.PaneHolder?.OpenInOtherPane(path);
 
 			return Task.CompletedTask;
diff --git a/src/Files.App/Actions/Navigation/OpenInOtherPane/OpenInOtherPaneFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInOtherPane/OpenInOtherPaneFromSidebarAction.cs
index 2a3b3e21d54b..9d5c6c00f77d 100644
--- a/src/Files.App/Actions/Navigation/OpenInOtherPane/OpenInOtherPaneFromSidebarAction.cs
+++ b/src/Files.App/Actions/Navigation/OpenInOtherPane/OpenInOtherPaneFromSidebarAction.cs
@@ -8,8 +8,8 @@ internal sealed partial class OpenInOtherPaneFromSidebarAction : BaseOpenInOther
 	{
 		public override bool IsExecutable =>
 			SidebarContext.IsItemRightClicked &&
-			SidebarContext.RightClickedItem is not null &&
-			SidebarContext.RightClickedItem.MenuOptions.IsLocationItem &&
+			SidebarContext.RightClickedItem is { } item &&
+			item.MenuOptions!.IsLocationItem &&
 			ContentPageContext.IsMultiPaneActive;
 
 		public override bool IsAccessibleGlobally
diff --git a/src/Files.App/Actions/Navigation/PreviousTabAction.cs b/src/Files.App/Actions/Navigation/PreviousTabAction.cs
index f0ff278c4483..19ecd9f30ad6 100644
--- a/src/Files.App/Actions/Navigation/PreviousTabAction.cs
+++ b/src/Files.App/Actions/Navigation/PreviousTabAction.cs
@@ -45,7 +45,8 @@ public async Task ExecuteAsync(object? parameter = null)
 			await Task.Delay(500);
 
 			// Focus the content of the selected tab item (needed for keyboard navigation)
-			contentPageContext.ShellPage!.PaneHolder.FocusActivePane();
+			var paneHolder = contentPageContext.ShellPage.GetRequiredPaneHolder();
+			paneHolder.FocusActivePane();
 		}
 
 		private void MultitaskingContext_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Navigation/SplitPaneHorizontallyAction.cs b/src/Files.App/Actions/Navigation/SplitPaneHorizontallyAction.cs
index 5e1f39cdf295..9c9eb658f3fd 100644
--- a/src/Files.App/Actions/Navigation/SplitPaneHorizontallyAction.cs
+++ b/src/Files.App/Actions/Navigation/SplitPaneHorizontallyAction.cs
@@ -34,7 +34,10 @@ public SplitPaneHorizontallyAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			ContentPageContext.ShellPage!.PaneHolder.OpenSecondaryPane(ContentPageContext.ShellPage!.ShellViewModel.WorkingDirectory, ShellPaneArrangement.Horizontal);
+			var shellPage = ContentPageContext.ShellPage ?? throw new InvalidOperationException("An active shell page is required to split the pane.");
+			var paneHolder = shellPage.GetRequiredPaneHolder();
+			var shellViewModel = shellPage.GetRequiredShellViewModel();
+			paneHolder.OpenSecondaryPane(shellViewModel.WorkingDirectory ?? string.Empty, ShellPaneArrangement.Horizontal);
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Navigation/SplitPaneVerticallyAction.cs b/src/Files.App/Actions/Navigation/SplitPaneVerticallyAction.cs
index b00e481df066..a2ec895e0f38 100644
--- a/src/Files.App/Actions/Navigation/SplitPaneVerticallyAction.cs
+++ b/src/Files.App/Actions/Navigation/SplitPaneVerticallyAction.cs
@@ -34,7 +34,10 @@ public SplitPaneVerticallyAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			ContentPageContext.ShellPage!.PaneHolder.OpenSecondaryPane(ContentPageContext.ShellPage!.ShellViewModel.WorkingDirectory, ShellPaneArrangement.Vertical);
+			var shellPage = ContentPageContext.ShellPage ?? throw new InvalidOperationException("An active shell page is required to split the pane.");
+			var paneHolder = shellPage.GetRequiredPaneHolder();
+			var shellViewModel = shellPage.GetRequiredShellViewModel();
+			paneHolder.OpenSecondaryPane(shellViewModel.WorkingDirectory ?? string.Empty, ShellPaneArrangement.Vertical);
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Open/OpenInIDEAction.cs b/src/Files.App/Actions/Open/OpenInIDEAction.cs
index 9c461c1ae737..469b8f7bc0e1 100644
--- a/src/Files.App/Actions/Open/OpenInIDEAction.cs
+++ b/src/Files.App/Actions/Open/OpenInIDEAction.cs
@@ -37,8 +37,12 @@ public OpenInIDEAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
+			var shellPage = _context.ShellPage
+				?? throw new InvalidOperationException("An active shell page is required to open the current folder in an IDE.");
+			var shellViewModel = shellPage.GetRequiredShellViewModel();
+
 			var res = await Win32Helper.RunPowershellCommandAsync(
-				$"& \'{_devToolsSettingsService.IDEPath}\' \'{_context.ShellPage?.ShellViewModel.WorkingDirectory}\'",
+				$"& \'{_devToolsSettingsService.IDEPath}\' \'{shellViewModel.WorkingDirectory}\'",
 				PowerShellExecutionOptions.Hidden
 			);
 
diff --git a/src/Files.App/Actions/Open/OpenTerminalAction.cs b/src/Files.App/Actions/Open/OpenTerminalAction.cs
index 0a9f66240057..74437675869c 100644
--- a/src/Files.App/Actions/Open/OpenTerminalAction.cs
+++ b/src/Files.App/Actions/Open/OpenTerminalAction.cs
@@ -128,12 +128,12 @@ protected virtual string[] GetPaths()
 			{
 				return context.SelectedItems!
 					.Where(item => item.PrimaryItemAttribute is StorageItemTypes.Folder && !item.IsArchive)
-					.Select(item => item.ItemPath)
+					.Select(item => item.ItemPath!)
 					.ToArray();
 			}
 			else if (context.Folder is not null)
 			{
-				return [context.Folder.ItemPath];
+				return [context.Folder.ItemPath!];
 			}
 
 			return [];
diff --git a/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs b/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs
index 1f8664c6861a..a60b6ff9bf5e 100644
--- a/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs
+++ b/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs
@@ -16,9 +16,9 @@ public override string Description
 
 		public override bool IsExecutable =>
 			SidebarContext.IsItemRightClicked &&
-			SidebarContext.RightClickedItem is not null &&
-			SidebarContext.RightClickedItem.MenuOptions.ShowShellItems &&
-			!SidebarContext.RightClickedItem.MenuOptions.ShowEmptyRecycleBin;
+			SidebarContext.RightClickedItem is { } item &&
+			item.MenuOptions!.ShowShellItems &&
+			!item.MenuOptions.ShowEmptyRecycleBin;
 
 		public override bool IsAccessibleGlobally
 			=> false;
@@ -29,7 +29,10 @@ public override HotKey HotKey
 		protected override string[] GetPaths()
 		{
 			if (SidebarContext.IsItemRightClicked && SidebarContext.RightClickedItem is not null)
-				return [SidebarContext.RightClickedItem.Path];
+				return
+				[
+					SidebarContext.RightClickedItem.GetRequiredPath()
+				];
 
 			return [];
 		}
diff --git a/src/Files.App/Actions/Shelf/DeleteItemFromShelfAction.cs b/src/Files.App/Actions/Shelf/DeleteItemFromShelfAction.cs
index eebb415975a1..2fb7bb185c61 100644
--- a/src/Files.App/Actions/Shelf/DeleteItemFromShelfAction.cs
+++ b/src/Files.App/Actions/Shelf/DeleteItemFromShelfAction.cs
@@ -50,7 +50,8 @@ public async Task ExecuteAsync(object? parameter = null)
 			}));
 
 			await shellPage.FilesystemHelpers.DeleteItemsAsync(itemsToDelete, foldersSettingsService.DeleteConfirmationPolicy, false, true);
-			await shellPage.ShellViewModel.ApplyFilesAndFoldersChangesAsync();
+			var shellViewModel = shellPage.GetRequiredShellViewModel();
+			await shellViewModel.ApplyFilesAndFoldersChangesAsync();
 		}
 
 		private void ShelfContext_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Show/ToggleDualPaneAction.cs b/src/Files.App/Actions/Show/ToggleDualPaneAction.cs
index 3a327aa631ab..3be97fa84c08 100644
--- a/src/Files.App/Actions/Show/ToggleDualPaneAction.cs
+++ b/src/Files.App/Actions/Show/ToggleDualPaneAction.cs
@@ -32,9 +32,19 @@ public ToggleDualPaneAction()
 		public Task ExecuteAsync(object? parameter = null)
 		{
 			if (IsOn)
-				ContentPageContext.ShellPage?.PaneHolder.CloseOtherPane();
+			{
+				if (ContentPageContext.ShellPage is { } shellPage)
+					shellPage.GetRequiredPaneHolder().CloseOtherPane();
+			}
 			else
-				ContentPageContext.ShellPage?.PaneHolder.OpenSecondaryPane(ContentPageContext.ShellPage!.ShellViewModel.WorkingDirectory, generalSettingsService.ShellPaneArrangementOption);
+			{
+				if (ContentPageContext.ShellPage is not { } shellPage)
+					return Task.CompletedTask;
+
+				var paneHolder = shellPage.GetRequiredPaneHolder();
+				var shellViewModel = shellPage.GetRequiredShellViewModel();
+				paneHolder.OpenSecondaryPane(shellViewModel.WorkingDirectory ?? string.Empty, generalSettingsService.ShellPaneArrangementOption);
+			}
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs b/src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs
index ef39911eea13..a3d207249f39 100644
--- a/src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs
+++ b/src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs
@@ -37,12 +37,18 @@ public Task ExecuteAsync(object? parameter = null)
 			generalSettingsService.ShowFilterHeader = !IsOn;
 
 			// Only attempt to focus if there's an active shell page
-			if (ContentPageContext.ShellPage is not null)
+			if (ContentPageContext.ShellPage is { } shellPage)
 			{
 				if (IsOn)
-					ContentPageContext.ShellPage.ShellViewModel.InvokeFocusFilterHeader();
+				{
+					var shellViewModel = shellPage.GetRequiredShellViewModel();
+					shellViewModel.InvokeFocusFilterHeader();
+				}
 				else
-					ContentPageContext.ShellPage.PaneHolder.FocusActivePane();
+				{
+					var paneHolder = shellPage.GetRequiredPaneHolder();
+					paneHolder.FocusActivePane();
+				}
 			}
 
 			return Task.CompletedTask;
diff --git a/src/Files.App/Actions/Sidebar/CopyItemFromSidebarAction.cs b/src/Files.App/Actions/Sidebar/CopyItemFromSidebarAction.cs
index cd699359d263..ac37473f2e37 100644
--- a/src/Files.App/Actions/Sidebar/CopyItemFromSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/CopyItemFromSidebarAction.cs
@@ -92,7 +92,7 @@ private bool GetIsExecutable()
 
 			return SidebarContext.IsItemRightClicked
 				&& item is not null
-				&& item.MenuOptions.IsLocationItem
+				&& item.MenuOptions!.IsLocationItem
 				&& !IsNonCopyableLocation(item);
 		}
 
diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index bb096a2daa87..4343b1350811 100644
--- a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -39,13 +39,13 @@ public async Task ExecuteAsync(object? parameter = null)
 		{
 			if (context.HasSelection)
 			{
-				var items = context.SelectedItems.Select(x => x.ItemPath).ToArray();
+				var items = context.SelectedItems.Select(x => x.ItemPath!).ToArray();
 
 				await service.PinToSidebarAsync(items);
 			}
 			else if (context.Folder is not null)
 			{
-				await service.PinToSidebarAsync(context.Folder.ItemPath);
+				await service.PinToSidebarAsync(context.Folder.ItemPath!);
 			}
 		}
 
@@ -65,7 +65,7 @@ bool IsPinnable(ListedItem item)
 				return
 					item.PrimaryItemAttribute is StorageItemTypes.Folder &&
 					!item.IsArchive &&
-					!pinnedFolders.Contains(item.ItemPath);
+					!pinnedFolders.Contains(item.ItemPath!);
 			}
 		}
 
diff --git a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
index 71ca41553269..9401b492d9db 100644
--- a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -37,12 +37,12 @@ public async Task ExecuteAsync(object? parameter = null)
 		{
 			if (context.HasSelection)
 			{
-				var items = context.SelectedItems.Select(x => x.ItemPath).ToArray();
+				var items = context.SelectedItems.Select(x => x.ItemPath!).ToArray();
 				await service.UnpinFromSidebarAsync(items);
 			}
 			else if (context.Folder is not null)
 			{
-				await service.UnpinFromSidebarAsync(context.Folder.ItemPath);
+				await service.UnpinFromSidebarAsync(context.Folder.ItemPath!);
 			}
 		}
 
@@ -56,7 +56,7 @@ private bool GetIsExecutable()
 
 			bool IsPinned(ListedItem item)
 			{
-				return pinnedFolders.Contains(item.ItemPath);
+				return pinnedFolders.Contains(item.ItemPath!);
 			}
 		}
 
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
index d685a532b81f..b138f8aed858 100644
--- a/src/Files.App/Actions/Start/PinToStartAction.cs
+++ b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -40,11 +40,14 @@ public async Task ExecuteAsync(object? parameter = null)
 				{
 					await SafetyExtensions.IgnoreExceptions(async () =>
 					{
+						var itemPath = listedItem.GetRequiredPath();
 						IStorable storable = listedItem switch
 						{
 							// Archives are marked as folders when browsable in-app but are files on disk
-							{ IsFolder: true, IsArchive: false } => await StorageService.GetFolderAsync(listedItem.ItemPath),
-							_ => await StorageService.GetFileAsync((listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath)
+							{ IsFolder: true, IsArchive: false } => await StorageService.GetFolderAsync(itemPath),
+							_ => await StorageService.GetFileAsync((listedItem as IShortcutItem)?.TargetPath is { Length: > 0 } targetPath
+								? targetPath
+								: itemPath)
 						};
 						await StartMenuService.PinAsync(storable, listedItem.Name);
 					});
@@ -55,9 +58,10 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 				await SafetyExtensions.IgnoreExceptions(async () =>
 				{
 					var currentFolder = context.ShellPage.ShellViewModel.CurrentFolder;
+					var currentFolderPath = currentFolder.GetRequiredPath();
 					IStorable storable = context.PageType is ContentPageTypes.ZipFolder
-						? await StorageService.GetFileAsync(currentFolder.ItemPath)
-						: await StorageService.GetFolderAsync(currentFolder.ItemPath);
+						? await StorageService.GetFileAsync(currentFolderPath)
+						: await StorageService.GetFolderAsync(currentFolderPath);
 
 					await StartMenuService.PinAsync(storable, currentFolder.Name);
 				});
diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
index ede4883f561e..7166d920ac35 100644
--- a/src/Files.App/Actions/Start/UnpinFromStartAction.cs
+++ b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -33,15 +33,20 @@ public async Task ExecuteAsync(object? parameter = null)
 		{
 			if (context.SelectedItems.Count > 0)
 			{
-				foreach (ListedItem listedItem in context.ShellPage?.SlimContentPage.SelectedItems)
+				var selectedItems = context.ShellPage?.SlimContentPage?.SelectedItems
+					?? throw new InvalidOperationException("The active file-list selection is not available.");
+				foreach (ListedItem listedItem in selectedItems)
 				{
 					await SafetyExtensions.IgnoreExceptions(async () =>
 					{
+						var itemPath = listedItem.GetRequiredPath();
 						IStorable storable = listedItem switch
 						{
 							// Archives are marked as folders when browsable in-app but are files on disk
-							{ IsFolder: true, IsArchive: false } => await StorageService.GetFolderAsync(listedItem.ItemPath),
-							_ => await StorageService.GetFileAsync((listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath)
+							{ IsFolder: true, IsArchive: false } => await StorageService.GetFolderAsync(itemPath),
+							_ => await StorageService.GetFileAsync((listedItem as IShortcutItem)?.TargetPath is { Length: > 0 } targetPath
+								? targetPath
+								: itemPath)
 						};
 						await StartMenuService.UnpinAsync(storable);
 					});
@@ -51,10 +56,12 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 			{
 				await SafetyExtensions.IgnoreExceptions(async () =>
 				{
-					var currentFolder = context.ShellPage.ShellViewModel.CurrentFolder;
+					var currentFolder = context.ShellPage?.ShellViewModel?.CurrentFolder
+						?? throw new InvalidOperationException("The current folder is not available.");
+					var currentFolderPath = currentFolder.GetRequiredPath();
 					IStorable storable = context.PageType is ContentPageTypes.ZipFolder
-						? await StorageService.GetFileAsync(currentFolder.ItemPath)
-						: await StorageService.GetFolderAsync(currentFolder.ItemPath);
+						? await StorageService.GetFileAsync(currentFolderPath)
+						: await StorageService.GetFolderAsync(currentFolderPath);
 
 					await StartMenuService.UnpinAsync(storable);
 				});
diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs
index b5842a331998..76b0c2d9fa08 100644
--- a/src/Files.App/App.xaml.cs
+++ b/src/Files.App/App.xaml.cs
@@ -175,7 +175,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(()
 		/// </summary>
 		private void Window_Activated(object sender, WindowActivatedEventArgs args)
 		{
-			Logger.LogInformation($"Window_Activated: State={args?.WindowActivationState.ToString()}");
+			Logger.LogInformation($"Window_Activated: State={args.WindowActivationState}");
 
 			if (args.WindowActivationState != WindowActivationState.Deactivated)
 				AppModel.IsMainWindowClosed = false;
@@ -218,7 +218,8 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 
 			if (OutputPath is not null)
 			{
-				var instance = MainPageViewModel.AppInstances.FirstOrDefault(x => x.TabItemContent.IsCurrentInstance);
+				var instance = MainPageViewModel.AppInstances.FirstOrDefault(x =>
+					(x.TabItemContent ?? throw new InvalidOperationException("A tab does not have content.")).IsCurrentInstance);
 				if (instance is null)
 					return;
 
@@ -226,7 +227,7 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 				if (items is null)
 					return;
 
-				var results = items.Select(x => x.ItemPath).ToList();
+				var results = items.Select(x => x.ItemPath!).ToList();
 				System.IO.File.WriteAllLines(OutputPath, results);
 
 				using var eventHandle = PInvoke.CreateEvent(null, false, false, "FILEDIALOG");
diff --git a/src/Files.App/Converters/DateTimeOffsetToStringConverter.cs b/src/Files.App/Converters/DateTimeOffsetToStringConverter.cs
index f919197467e0..8202efbbdf6e 100644
--- a/src/Files.App/Converters/DateTimeOffsetToStringConverter.cs
+++ b/src/Files.App/Converters/DateTimeOffsetToStringConverter.cs
@@ -7,7 +7,7 @@ namespace Files.App.Converters
 {
 	internal sealed partial class DateTimeOffsetToStringConverter : IValueConverter
 	{
-		private static readonly IDateTimeFormatter formatter = Ioc.Default.GetService<IDateTimeFormatter>();
+		private static readonly IDateTimeFormatter formatter = Ioc.Default.GetRequiredService<IDateTimeFormatter>();
 
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
@@ -16,11 +16,11 @@ public object Convert(object value, Type targetType, object parameter, string la
 				: formatter.ToLongLabel((DateTimeOffset)value);
 		}
 
-		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		public object? ConvertBack(object value, Type targetType, object parameter, string language)
 		{
 			try
 			{
-				return DateTimeOffset.Parse(value as string);
+				return DateTimeOffset.Parse((value as string)!);
 			}
 			catch (FormatException)
 			{
diff --git a/src/Files.App/Converters/DoubleArrayToStringConverter.cs b/src/Files.App/Converters/DoubleArrayToStringConverter.cs
index 31953912be9d..2d5beaee0907 100644
--- a/src/Files.App/Converters/DoubleArrayToStringConverter.cs
+++ b/src/Files.App/Converters/DoubleArrayToStringConverter.cs
@@ -27,7 +27,8 @@ public object Convert(object value, Type targetType, object parameter, string la
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
 		{
-			var strArray = (value as string).Split("; ");
+			var text = value as string ?? throw new ArgumentException("The value must be a string.", nameof(value));
+			var strArray = text.Split("; ");
 			var array = new double[strArray.Length];
 
 			for (int i = 0; i < strArray.Length; i++)
diff --git a/src/Files.App/Converters/DoubleToStringConverter.cs b/src/Files.App/Converters/DoubleToStringConverter.cs
index da2646ede853..c3dac789d2fb 100644
--- a/src/Files.App/Converters/DoubleToStringConverter.cs
+++ b/src/Files.App/Converters/DoubleToStringConverter.cs
@@ -7,7 +7,7 @@ namespace Files.App.Converters
 {
 	internal sealed partial class DoubleToStringConverter : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object? Convert(object value, Type targetType, object parameter, string language)
 		{
 			if (value is not null)
 			{
@@ -17,11 +17,11 @@ public object Convert(object value, Type targetType, object parameter, string la
 			return "";
 		}
 
-		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		public object? ConvertBack(object value, Type targetType, object parameter, string language)
 		{
 			try
 			{
-				return Double.Parse(value as string);
+				return double.Parse((value as string)!);
 			}
 			catch (FormatException)
 			{
diff --git a/src/Files.App/Converters/StringArrayToStringConverter.cs b/src/Files.App/Converters/StringArrayToStringConverter.cs
index 85d25f6e96eb..ed311236fcb4 100644
--- a/src/Files.App/Converters/StringArrayToStringConverter.cs
+++ b/src/Files.App/Converters/StringArrayToStringConverter.cs
@@ -26,7 +26,8 @@ public object Convert(object value, Type targetType, object parameter, string la
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
 		{
-			return (value as string).Split("; ");
+			var text = value as string ?? throw new ArgumentException("The value must be a string.", nameof(value));
+			return text.Split("; ");
 		}
 	}
 }
diff --git a/src/Files.App/Converters/UInt32ToStringConverter.cs b/src/Files.App/Converters/UInt32ToStringConverter.cs
index 51d5e3f723b4..9aaf47c5830d 100644
--- a/src/Files.App/Converters/UInt32ToStringConverter.cs
+++ b/src/Files.App/Converters/UInt32ToStringConverter.cs
@@ -9,14 +9,14 @@ internal sealed partial class UInt32ToStringConverter : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
-			return value is not null ? value.ToString() : string.Empty;
+			return value is not null ? value.ToString()! : string.Empty;
 		}
 
-		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		public object? ConvertBack(object value, Type targetType, object parameter, string language)
 		{
 			try
 			{
-				return uint.Parse(value as string);
+				return uint.Parse((value as string)!);
 			}
 			catch (FormatException)
 			{
diff --git a/src/Files.App/Data/Behaviors/StickyHeaderBehavior.cs b/src/Files.App/Data/Behaviors/StickyHeaderBehavior.cs
index d41f144e626b..5b72fa5de2cb 100644
--- a/src/Files.App/Data/Behaviors/StickyHeaderBehavior.cs
+++ b/src/Files.App/Data/Behaviors/StickyHeaderBehavior.cs
@@ -62,9 +62,9 @@ public StickyHeaderBehavior()
 		/// <remarks>
 		/// Set this using the header of a ListView or GridView.
 		/// </remarks>
-		public UIElement HeaderElement
+		public UIElement? HeaderElement
 		{
-			get => (UIElement)GetValue(HeaderElementProperty);
+			get => GetValue(HeaderElementProperty) as UIElement;
 			set => SetValue(HeaderElementProperty, value);
 		}
 
@@ -169,17 +169,14 @@ private bool AssignAnimation()
 			_headerVisual.StartAnimation("Offset.Y", expressionAnimation);
 
 			// Mod: clip items panel below header
-			var itemsPanel = listView.ItemsPanelRoot;
+			var itemsPanel = listView?.ItemsPanelRoot;
 
 			if (itemsPanel is null)
 				return true;
 
-			if (_itemsPanelVisual is null)
-			{
-				_itemsPanelVisual = ElementCompositionPreview.GetElementVisual(itemsPanel);
-				_contentClip = compositor.CreateInsetClip();
-				_itemsPanelVisual.Clip = _contentClip;
-			}
+			_itemsPanelVisual ??= ElementCompositionPreview.GetElementVisual(itemsPanel);
+			_contentClip ??= compositor.CreateInsetClip();
+			_itemsPanelVisual.Clip = _contentClip;
 
 			var expressionClipAnimation = ExpressionFunctions.Max(-scrollPropSet.Translation.Y, 0);
 			_contentClip.TopInset = (float)Math.Max(-_scrollViewer.VerticalOffset, 0);
diff --git a/src/Files.App/Data/Contexts/MultiPanes/MultiPanesContext.cs b/src/Files.App/Data/Contexts/MultiPanes/MultiPanesContext.cs
index 2df8d741b864..de4ffb3752a6 100644
--- a/src/Files.App/Data/Contexts/MultiPanes/MultiPanesContext.cs
+++ b/src/Files.App/Data/Contexts/MultiPanes/MultiPanesContext.cs
@@ -65,7 +65,7 @@ private void Page_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 					UpdateContent();
 					break;
 				case nameof(IShellPanesPage.ShellPaneArrangement):
-					_ShellPaneArrangement = ActivePane?.PaneHolder.ShellPaneArrangement ?? ShellPaneArrangement.Horizontal;
+					_ShellPaneArrangement = ActivePane?.PaneHolder?.ShellPaneArrangement ?? ShellPaneArrangement.Horizontal;
 					ShellPaneArrangementChanged?.Invoke(this, EventArgs.Empty);
 					break;
 			}
@@ -106,7 +106,7 @@ private void UpdateContent()
 
 			ActivePaneChanged?.Invoke(this, EventArgs.Empty);
 
-			_ShellPaneArrangement = ActivePane?.PaneHolder.ShellPaneArrangement ?? ShellPaneArrangement.Horizontal;
+			_ShellPaneArrangement = ActivePane?.PaneHolder?.ShellPaneArrangement ?? ShellPaneArrangement.Horizontal;
 			ShellPaneArrangementChanged?.Invoke(this, EventArgs.Empty);
 		}
 	}
diff --git a/src/Files.App/Data/Contexts/Multitasking/IMultitaskingContext.cs b/src/Files.App/Data/Contexts/Multitasking/IMultitaskingContext.cs
index d68068155de2..26147674c6a7 100644
--- a/src/Files.App/Data/Contexts/Multitasking/IMultitaskingContext.cs
+++ b/src/Files.App/Data/Contexts/Multitasking/IMultitaskingContext.cs
@@ -9,10 +9,10 @@ public interface IMultitaskingContext : INotifyPropertyChanged
 
 		ushort TabCount { get; }
 
-		TabBarItem CurrentTabItem { get; }
+		TabBarItem? CurrentTabItem { get; }
 		ushort CurrentTabIndex { get; }
 
-		TabBarItem SelectedTabItem { get; }
+		TabBarItem? SelectedTabItem { get; }
 		ushort SelectedTabIndex { get; }
 	}
 }
diff --git a/src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs b/src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs
index 15dfcb901c87..a946528b03aa 100644
--- a/src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs
+++ b/src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs
@@ -17,8 +17,8 @@ internal sealed partial class MultitaskingContext : ObservableObject, IMultitask
 		private ushort tabCount = 0;
 		public ushort TabCount => tabCount;
 
-		public TabBarItem CurrentTabItem => MainPageViewModel.AppInstances.ElementAtOrDefault(currentTabIndex);
-		public TabBarItem SelectedTabItem => MainPageViewModel.AppInstances.ElementAtOrDefault(selectedTabIndex);
+		public TabBarItem? CurrentTabItem => MainPageViewModel.AppInstances.ElementAtOrDefault(currentTabIndex);
+		public TabBarItem? SelectedTabItem => MainPageViewModel.AppInstances.ElementAtOrDefault(selectedTabIndex);
 
 		private ushort currentTabIndex = 0;
 		public ushort CurrentTabIndex => currentTabIndex;
diff --git a/src/Files.App/Data/Contexts/Tags/TagsContext.cs b/src/Files.App/Data/Contexts/Tags/TagsContext.cs
index 5ae3fe925207..e5c98ef2f477 100644
--- a/src/Files.App/Data/Contexts/Tags/TagsContext.cs
+++ b/src/Files.App/Data/Contexts/Tags/TagsContext.cs
@@ -32,7 +32,7 @@ public TagsContext()
 			SidebarViewModel.SelectedTagChanged += SelectedTagsChanged;
 		}
 
-		private void SelectedTagsChanged(object _, SelectedTagChangedEventArgs e)
+		private void SelectedTagsChanged(object? _, SelectedTagChangedEventArgs e)
 		{
 			TaggedItems = e.Items;
 		}
diff --git a/src/Files.App/Data/Contracts/IAddItemService.cs b/src/Files.App/Data/Contracts/IAddItemService.cs
index 58c65aff5c97..686c7e7c168b 100644
--- a/src/Files.App/Data/Contracts/IAddItemService.cs
+++ b/src/Files.App/Data/Contracts/IAddItemService.cs
@@ -18,6 +18,6 @@ public interface IAddItemService
 		/// Gets a list of the available item types
 		/// </summary>
 		/// <returns>List of the available item types</returns>
-		List<ShellNewEntry> GetEntries();
+		List<ShellNewEntry>? GetEntries();
 	}
 }
diff --git a/src/Files.App/Data/Contracts/IAddressToolbarViewModel.cs b/src/Files.App/Data/Contracts/IAddressToolbarViewModel.cs
index 56ce2713f646..44e8bf28436b 100644
--- a/src/Files.App/Data/Contracts/IAddressToolbarViewModel.cs
+++ b/src/Files.App/Data/Contracts/IAddressToolbarViewModel.cs
@@ -17,7 +17,7 @@ public interface IAddressToolbarViewModel
 
 		public bool IsSingleItemOverride { get; set; }
 
-		public string PathControlDisplayText { get; set; }
+		public string? PathControlDisplayText { get; set; }
 
 		public ObservableCollection<PathBoxItem> PathComponents { get; }
 
diff --git a/src/Files.App/Data/Contracts/ICompressArchiveModel.cs b/src/Files.App/Data/Contracts/ICompressArchiveModel.cs
index 83894e6b4abd..90fa0d09a005 100644
--- a/src/Files.App/Data/Contracts/ICompressArchiveModel.cs
+++ b/src/Files.App/Data/Contracts/ICompressArchiveModel.cs
@@ -66,7 +66,7 @@ public interface ICompressArchiveModel
 		/// <summary>
 		/// Archiving progress.
 		/// </summary>
-		IProgress<StatusCenterItemProgressModel> Progress { get; set; }
+		IProgress<StatusCenterItemProgressModel>? Progress { get; set; }
 
 		/// <summary>
 		/// Cancellation request.
diff --git a/src/Files.App/Data/Contracts/IFileTagsSettingsService.cs b/src/Files.App/Data/Contracts/IFileTagsSettingsService.cs
index 7a886a5e0eaa..da5c65f336b9 100644
--- a/src/Files.App/Data/Contracts/IFileTagsSettingsService.cs
+++ b/src/Files.App/Data/Contracts/IFileTagsSettingsService.cs
@@ -5,15 +5,15 @@ namespace Files.App.Data.Contracts
 {
 	public interface IFileTagsSettingsService : IBaseSettingsService
 	{
-		event EventHandler OnSettingImportedEvent;
+		event EventHandler? OnSettingImportedEvent;
 
-		event EventHandler OnTagsUpdated;
+		event EventHandler? OnTagsUpdated;
 
 		IList<TagViewModel> FileTagList { get; set; }
 
-		TagViewModel GetTagById(string uid);
+		TagViewModel? GetTagById(string uid);
 
-		IList<TagViewModel>? GetTagsByIds(string[] uids);
+		IList<TagViewModel>? GetTagsByIds(string[]? uids);
 
 		IEnumerable<TagViewModel> GetTagsByName(string tagName);
 
@@ -27,4 +27,4 @@ public interface IFileTagsSettingsService : IBaseSettingsService
 
 		bool ImportSettings(object import);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Data/Contracts/IGeneralSettingsService.cs b/src/Files.App/Data/Contracts/IGeneralSettingsService.cs
index bdb7c6c45f73..5a9e4c510921 100644
--- a/src/Files.App/Data/Contracts/IGeneralSettingsService.cs
+++ b/src/Files.App/Data/Contracts/IGeneralSettingsService.cs
@@ -33,12 +33,12 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// <summary>
 		/// A list containing all paths to open at startup.
 		/// </summary>
-		List<string> TabsOnStartupList { get; set; }
+		List<string>? TabsOnStartupList { get; set; }
 
 		/// <summary>
 		/// A list containing all paths to tabs closed on last session.
 		/// </summary>
-		List<string> LastSessionTabList { get; set; }
+		List<string>? LastSessionTabList { get; set; }
 
 		/// <summary>
 		/// Gets or sets the index of the tab that was active when the last session ended.
@@ -48,22 +48,22 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// <summary>
 		/// A list containing paths of the tabs from the previous session that crashed.
 		/// </summary>
-		List<string> LastCrashedTabList { get; set; }
+		List<string>? LastCrashedTabList { get; set; }
 
 		/// <summary>
 		/// A list containing paths previously entered in the path bar.
 		/// </summary>
-		List<string> PathHistoryList { get; set; }
+		List<string>? PathHistoryList { get; set; }
 
 		/// <summary>
 		/// A list containing previous search queries.
 		/// </summary>
-		List<string> PreviousSearchQueriesList { get; set; }
+		List<string>? PreviousSearchQueriesList { get; set; }
 
 		/// <summary>
 		/// Stores list of paths where archives have previously been extracted.
 		/// </summary>
-		List<string> PreviousArchiveExtractionLocations { get; set; }
+		List<string>? PreviousArchiveExtractionLocations { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating which date and time format to use.
@@ -323,7 +323,7 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// <summary>
 		/// A dictionary to determine which hashes should be shown.
 		/// </summary>
-		Dictionary<string, bool> ShowHashesDictionary { get; set; }
+		Dictionary<string, bool>? ShowHashesDictionary { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating a random user ID.
diff --git a/src/Files.App/Data/Contracts/IIconCacheService.cs b/src/Files.App/Data/Contracts/IIconCacheService.cs
index 8afbab133918..c856b0400181 100644
--- a/src/Files.App/Data/Contracts/IIconCacheService.cs
+++ b/src/Files.App/Data/Contracts/IIconCacheService.cs
@@ -5,7 +5,7 @@ namespace Files.App.Data.Contracts
 {
 	internal interface IIconCacheService
 	{
-		Task<byte[]?> GetIconAsync(string itemPath, string? extension, bool isFolder);
+		Task<byte[]?> GetIconAsync(string? itemPath, string? extension, bool isFolder);
 
 		void Clear();
 	}
diff --git a/src/Files.App/Data/Contracts/IMultiPaneInfo.cs b/src/Files.App/Data/Contracts/IMultiPaneInfo.cs
index 75f0cf29fa0e..58cd72684caf 100644
--- a/src/Files.App/Data/Contracts/IMultiPaneInfo.cs
+++ b/src/Files.App/Data/Contracts/IMultiPaneInfo.cs
@@ -5,6 +5,6 @@ namespace Files.App.Data.Contracts
 {
 	public interface IMultiPaneInfo
 	{
-		public IShellPanesPage PaneHolder { get; }
+		public IShellPanesPage? PaneHolder { get; }
 	}
 }
diff --git a/src/Files.App/Data/Contracts/INavigationControlItem.cs b/src/Files.App/Data/Contracts/INavigationControlItem.cs
index da7f64839e41..125317eb33b2 100644
--- a/src/Files.App/Data/Contracts/INavigationControlItem.cs
+++ b/src/Files.App/Data/Contracts/INavigationControlItem.cs
@@ -5,17 +5,27 @@
 
 namespace Files.App.Data.Contracts
 {
-	public interface INavigationControlItem : IComparable<INavigationControlItem>, INotifyPropertyChanged, ISidebarItemModel
+	public interface INavigationControlItem : IComparable<INavigationControlItem>, INotifyPropertyChanged, ISidebarItemModel, ISidebarItemPresentationModel
 	{
-		public new string Text { get; }
+		public string? Text { get; }
 
-		public string Path { get; }
+		public string? Path { get; }
 
 		public SectionType Section { get; }
 
 		public NavigationControlItemType ItemType { get; }
 
-		public ContextMenuOptions MenuOptions { get; }
+		public ContextMenuOptions? MenuOptions { get; }
+	}
+
+	internal static class NavigationControlItemExtensions
+	{
+		extension(INavigationControlItem? item)
+		{
+			public string GetRequiredPath()
+			=> item?.Path
+				?? throw new InvalidOperationException("The navigation item does not have a path.");
+		}
 	}
 
 	public enum NavigationControlItemType
diff --git a/src/Files.App/Data/Contracts/IShellPage.cs b/src/Files.App/Data/Contracts/IShellPage.cs
index b75626883d1a..522a46b29987 100644
--- a/src/Files.App/Data/Contracts/IShellPage.cs
+++ b/src/Files.App/Data/Contracts/IShellPage.cs
@@ -7,7 +7,7 @@ namespace Files.App.Data.Contracts
 {
 	public interface IShellPage : ITabBarItemContent, IMultiPaneInfo, IDisposable, INotifyPropertyChanged
 	{
-		ShellViewModel ShellViewModel { get; }
+		ShellViewModel? ShellViewModel { get; }
 
 		CurrentInstanceViewModel InstanceViewModel { get; }
 
@@ -17,7 +17,7 @@ public interface IShellPage : ITabBarItemContent, IMultiPaneInfo, IDisposable, I
 
 		IList<PageStackEntry> BackwardStack { get; }
 
-		IBaseLayoutPage SlimContentPage { get; }
+		IBaseLayoutPage? SlimContentPage { get; }
 
 		Type CurrentPageType { get; }
 
@@ -50,16 +50,16 @@ public interface IShellPage : ITabBarItemContent, IMultiPaneInfo, IDisposable, I
 
 		void Up_Click();
 
-		Task UpdatePathUIToWorkingDirectoryAsync(string newWorkingDir, string singleItemOverride = null);
+		Task UpdatePathUIToWorkingDirectoryAsync(string? newWorkingDir, string? singleItemOverride = null);
 
-		void NavigateToPath(string navigationPath, Type sourcePageType, NavigationArguments navArgs = null);
+		void NavigateToPath(string? navigationPath, Type? sourcePageType, NavigationArguments? navArgs = null);
 
 		/// <summary>
 		/// Gets the layout mode for the specified path then navigates to it
 		/// </summary>
 		/// <param name="navigationPath"></param>
 		/// <param name="navArgs"></param>
-		public void NavigateToPath(string navigationPath, NavigationArguments navArgs = null);
+		public void NavigateToPath(string navigationPath, NavigationArguments? navArgs = null);
 
 		/// <summary>
 		/// Navigates to the home page
@@ -92,4 +92,18 @@ public interface IShellPage : ITabBarItemContent, IMultiPaneInfo, IDisposable, I
 		/// </summary>
 		public bool IsColumnView { get; }
 	}
+
+	internal static class ShellPageExtensions
+	{
+		extension(IShellPage? shellPage)
+		{
+			public ShellViewModel GetRequiredShellViewModel()
+			=> shellPage?.ShellViewModel
+				?? throw new InvalidOperationException("The shell page does not have a shell view model.");
+
+			public IShellPanesPage GetRequiredPaneHolder()
+			=> shellPage?.PaneHolder
+				?? throw new InvalidOperationException("The shell page does not have a pane holder.");
+		}
+	}
 }
diff --git a/src/Files.App/Data/Contracts/IVersionControlService.cs b/src/Files.App/Data/Contracts/IVersionControlService.cs
index 3236b56b5c46..8ef30155ae02 100644
--- a/src/Files.App/Data/Contracts/IVersionControlService.cs
+++ b/src/Files.App/Data/Contracts/IVersionControlService.cs
@@ -3,6 +3,7 @@
 
 using LibGit2Sharp;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Files.App.Data.Contracts
 {
@@ -26,7 +27,7 @@ public interface IVersionControlService
 		/// This method is used for determining whether a directory is within a repository and, if so,
 		/// which directory should be treated as the repository root.
 		/// </remarks>
-		string? GetGitRepositoryPath(string? path, string root);
+		string? GetGitRepositoryPath(string? path, string? root);
 
 		/// <summary>
 		/// Gets the repository name.
@@ -137,7 +138,7 @@ public interface IVersionControlService
 		/// <returns>
 		/// <see langword="true"/> if a repository was found; otherwise, <see langword="false"/>.
 		/// </returns>
-		bool IsRepositoryEx(string path, out string repoRootPath);
+		bool IsRepositoryEx([NotNullWhen(true)] string? path, [NotNullWhen(true)] out string? repoRootPath);
 
 		/// <summary>
 		/// Gets version control information for a filesystem item.
diff --git a/src/Files.App/Data/Contracts/IWidgetCardItem.cs b/src/Files.App/Data/Contracts/IWidgetCardItem.cs
index 7696304c8088..b895d5504da5 100644
--- a/src/Files.App/Data/Contracts/IWidgetCardItem.cs
+++ b/src/Files.App/Data/Contracts/IWidgetCardItem.cs
@@ -9,7 +9,7 @@ public interface IWidgetCardItem<T>
 	{
 		T Item { get; }
 
-		BitmapImage Thumbnail { get; }
+		BitmapImage? Thumbnail { get; }
 
 		Task LoadCardThumbnailAsync();
 	}
diff --git a/src/Files.App/Data/Contracts/IWindowsSecurityService.cs b/src/Files.App/Data/Contracts/IWindowsSecurityService.cs
index 3a679bf12eb5..b16f93978a6e 100644
--- a/src/Files.App/Data/Contracts/IWindowsSecurityService.cs
+++ b/src/Files.App/Data/Contracts/IWindowsSecurityService.cs
@@ -35,6 +35,6 @@ public interface IWindowsSecurityService
 		/// </summary>
 		/// <param name="path"></param>
 		/// <returns>True if the application needs to be elevated for some operations; otherwise, false.</returns>
-		bool IsElevationRequired(string path);
+		bool IsElevationRequired(string? path);
 	}
 }
diff --git a/src/Files.App/Data/EventArguments/CurrentInstanceChangedEventArgs.cs b/src/Files.App/Data/EventArguments/CurrentInstanceChangedEventArgs.cs
index b4a2154d6ee3..edb67b8b3404 100644
--- a/src/Files.App/Data/EventArguments/CurrentInstanceChangedEventArgs.cs
+++ b/src/Files.App/Data/EventArguments/CurrentInstanceChangedEventArgs.cs
@@ -5,8 +5,8 @@ namespace Files.App.Data.EventArguments
 {
 	public sealed class CurrentInstanceChangedEventArgs : EventArgs
 	{
-		public ITabBarItemContent CurrentInstance { get; set; }
+		public ITabBarItemContent? CurrentInstance { get; set; }
 
-		public List<ITabBarItemContent> PageInstances { get; set; }
+		public List<ITabBarItemContent?>? PageInstances { get; set; }
 	}
 }
diff --git a/src/Files.App/Data/EventArguments/PathBoxItemDroppedEventArgs.cs b/src/Files.App/Data/EventArguments/PathBoxItemDroppedEventArgs.cs
index e9b2c2c71439..a912a4236cfa 100644
--- a/src/Files.App/Data/EventArguments/PathBoxItemDroppedEventArgs.cs
+++ b/src/Files.App/Data/EventArguments/PathBoxItemDroppedEventArgs.cs
@@ -8,12 +8,12 @@ namespace Files.App.Data.EventArguments
 {
 	public sealed class PathBoxItemDroppedEventArgs
 	{
-		public DataPackageView Package { get; set; }
+		public DataPackageView? Package { get; set; }
 
-		public string Path { get; set; }
+		public string? Path { get; set; }
 
 		public DataPackageOperation AcceptedOperation { get; set; }
 
-		public AsyncManualResetEvent SignalEvent { get; set; }
+		public AsyncManualResetEvent? SignalEvent { get; set; }
 	}
 }
diff --git a/src/Files.App/Data/EventArguments/PathNavigationEventArgs.cs b/src/Files.App/Data/EventArguments/PathNavigationEventArgs.cs
index f44bd27aeb46..86cd4a206036 100644
--- a/src/Files.App/Data/EventArguments/PathNavigationEventArgs.cs
+++ b/src/Files.App/Data/EventArguments/PathNavigationEventArgs.cs
@@ -5,9 +5,9 @@ namespace Files.App.Data.EventArguments
 {
 	public sealed class PathNavigationEventArgs
 	{
-		public string ItemPath { get; set; }
+		public string? ItemPath { get; set; }
 
-		public string ItemName { get; set; }
+		public string? ItemName { get; set; }
 
 		public bool IsFile { get; set; }
 	}
diff --git a/src/Files.App/Data/EventArguments/QuickAccessCardEventArgs.cs b/src/Files.App/Data/EventArguments/QuickAccessCardEventArgs.cs
index 53f2f7e16433..1750360fce5f 100644
--- a/src/Files.App/Data/EventArguments/QuickAccessCardEventArgs.cs
+++ b/src/Files.App/Data/EventArguments/QuickAccessCardEventArgs.cs
@@ -20,7 +20,7 @@ public ModifyQuickAccessEventArgs(string[] paths, bool add)
 
 		public ModifyQuickAccessEventArgs(ShellFileItem[] items, bool add)
 		{
-			Paths = items.Select(x => x.FilePath).ToArray();
+			Paths = items.Select(x => x.FilePath!).ToArray();
 			Items = items;
 			Add = add;
 		}
diff --git a/src/Files.App/Data/EventArguments/ToolbarQuerySubmittedEventArgs.cs b/src/Files.App/Data/EventArguments/ToolbarQuerySubmittedEventArgs.cs
index 8e83c9b4f6f9..303c015605c5 100644
--- a/src/Files.App/Data/EventArguments/ToolbarQuerySubmittedEventArgs.cs
+++ b/src/Files.App/Data/EventArguments/ToolbarQuerySubmittedEventArgs.cs
@@ -5,6 +5,6 @@ namespace Files.App.Data.EventArguments
 {
 	public sealed class ToolbarQuerySubmittedEventArgs
 	{
-		public string QueryText { get; set; } = null;
+		public string? QueryText { get; set; }
 	}
 }
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
index 63eeac377579..1827aee62457 100644
--- a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
+++ b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -31,7 +31,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetItemContextCommandsWithout
 			return menuItemsList;
 		}
 
-		public static Task<List<ContextMenuFlyoutItemViewModel>> GetItemContextShellCommandsAsync(string workingDir, List<ListedItem> selectedItems, bool shiftPressed, bool showOpenMenu, CancellationToken cancellationToken)
+		public static Task<List<ContextMenuFlyoutItemViewModel>> GetItemContextShellCommandsAsync(string? workingDir, List<ListedItem> selectedItems, bool shiftPressed, bool showOpenMenu, CancellationToken cancellationToken)
 		{
 			return ShellContextFlyoutFactory.GetShellContextmenuAsync(shiftPressed: shiftPressed, showOpenMenu: showOpenMenu, workingDirectory: workingDir, selectedItems: selectedItems, cancellationToken: cancellationToken);
 		}
@@ -44,20 +44,23 @@ public static List<ContextMenuFlyoutItemViewModel> Filter(List<ContextMenuFlyout
 			var overflow = items.FirstOrDefault(x => x.ID == "ItemOverflow");
 			if (overflow is not null)
 			{
+				var overflowMenuItems = overflow.Items
+					?? throw new InvalidOperationException("The overflow menu has not been initialized.");
+
 				if (!shiftPressed && UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu) // items with ShowOnShift to overflow menu
 				{
 					var overflowItems = items.Where(x => x.ShowOnShift).ToList();
 
 					// Adds a separator between items already there and the new ones
-					if (overflow.Items.Count != 0 && overflowItems.Count > 0 && overflow.Items.Last().ItemType != ContextMenuFlyoutItemType.Separator)
-						overflow.Items.Add(new ContextMenuFlyoutItemViewModel { ItemType = ContextMenuFlyoutItemType.Separator });
+					if (overflowMenuItems.Count != 0 && overflowItems.Count > 0 && overflowMenuItems.Last().ItemType != ContextMenuFlyoutItemType.Separator)
+						overflowMenuItems.Add(new ContextMenuFlyoutItemViewModel { ItemType = ContextMenuFlyoutItemType.Separator });
 
 					items = items.Except(overflowItems).ToList();
-					overflow.Items.AddRange(overflowItems);
+					overflowMenuItems.AddRange(overflowItems);
 				}
 
 				// remove the overflow if it has no child items
-				if (overflow.Items.Count == 0 && removeOverflowMenu)
+				if (overflowMenuItems.Count == 0 && removeOverflowMenu)
 					items.Remove(overflow);
 			}
 
diff --git a/src/Files.App/Data/Factories/PropertiesNavigationItemsFactory.cs b/src/Files.App/Data/Factories/PropertiesNavigationItemsFactory.cs
index 56b5e2ff3fb2..41e51f36b629 100644
--- a/src/Files.App/Data/Factories/PropertiesNavigationItemsFactory.cs
+++ b/src/Files.App/Data/Factories/PropertiesNavigationItemsFactory.cs
@@ -61,9 +61,10 @@ public static ObservableCollection<PropertiesNavigationItem> Initialize(object i
 				var isLibrary = listedItem.IsLibrary;
 				var fileExt = listedItem.FileExtension;
 				var isFolder = listedItem.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.Folder;
+				var itemPath = listedItem.ItemPath!;
 
-				var isMtpPath = DriveHelpers.IsMtpPath(listedItem.ItemPath);
-				var isNetworkPath = isFolder && DriveHelpers.IsNetworkPath(listedItem.ItemPath);
+				var isMtpPath = DriveHelpers.IsMtpPath(itemPath);
+				var isNetworkPath = isFolder && DriveHelpers.IsNetworkPath(itemPath);
 
 				var securityItemEnabled = !isLibrary && !listedItem.IsRecycleBinItem;
 				var hashItemEnabled = !(isFolder && !listedItem.IsArchive) && !isLibrary && !listedItem.IsRecycleBinItem;
diff --git a/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs b/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs
index 7250378ea1e2..d7da2f6cfedf 100644
--- a/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs
+++ b/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs
@@ -72,17 +72,14 @@ private static ContextMenuFlyoutItemViewModel CreateShellMenuItem(Win32ContextMe
 			};
 		}
 
-		public static async Task<List<ContextMenuFlyoutItemViewModel>> GetShellContextmenuAsync(bool showOpenMenu, bool shiftPressed, string workingDirectory, List<ListedItem>? selectedItems, CancellationToken cancellationToken)
+		public static async Task<List<ContextMenuFlyoutItemViewModel>> GetShellContextmenuAsync(bool showOpenMenu, bool shiftPressed, string? workingDirectory, List<ListedItem>? selectedItems, CancellationToken cancellationToken)
 		{
-			bool IsItemSelected = selectedItems?.Count > 0;
-
 			var menuItemsList = new List<ContextMenuFlyoutItemViewModel>();
+			var filePaths = selectedItems is { Count: > 0 }
+				? selectedItems.Select(x => x.ItemPath!).ToArray()
+				: [workingDirectory ?? throw new ArgumentException("A working directory is required when no items are selected.", nameof(workingDirectory))];
 
-			var filePaths = IsItemSelected
-				? selectedItems!.Select(x => x.ItemPath).ToArray()
-				: new[] { workingDirectory };
-
-			Func<string, bool> FilterMenuItems(bool showOpenMenu)
+			Func<string?, bool> FilterMenuItems(bool showOpenMenu)
 			{
 				var knownItems = new HashSet<string>()
 				{
@@ -100,7 +97,7 @@ Func<string, bool> FilterMenuItems(bool showOpenMenu)
 					"{9F156763-7844-4DC4-B2B1-901F640F5155}", // Open in Terminal
 				};
 
-				bool filterMenuItemsImpl(string menuItem) => !string.IsNullOrEmpty(menuItem)
+				bool filterMenuItemsImpl(string? menuItem) => !string.IsNullOrEmpty(menuItem)
 					&& (knownItems.Contains(menuItem) || (!showOpenMenu && menuItem.Equals("open", StringComparison.OrdinalIgnoreCase)));
 
 				return filterMenuItemsImpl;
@@ -110,7 +107,7 @@ bool filterMenuItemsImpl(string menuItem) => !string.IsNullOrEmpty(menuItem)
 				shiftPressed ? PInvoke.CMF_EXTENDEDVERBS : PInvoke.CMF_NORMAL, FilterMenuItems(showOpenMenu));
 
 			if (contextMenu is not null)
-				LoadMenuFlyoutItem(menuItemsList, contextMenu, contextMenu.Items, cancellationToken, true);
+				LoadMenuFlyoutItem(menuItemsList, contextMenu, contextMenu.Items!, cancellationToken, true);
 
 			if (cancellationToken.IsCancellationRequested)
 				menuItemsList.Clear();
@@ -143,12 +140,14 @@ private static void LoadMenuFlyoutItem(
 						Text = Strings.ShowMoreOptions.GetLocalizedResource(),
 						Glyph = "\xE712",
 					};
-					LoadMenuFlyoutItem(menuLayoutSubItem.Items, contextMenu, overflowItems, cancellationToken, showIcons);
+					LoadMenuFlyoutItem(menuLayoutSubItem.Items
+						?? throw new InvalidOperationException("The shell overflow menu has not been initialized."), contextMenu, overflowItems, cancellationToken, showIcons);
 					menuItemsListLocal.Insert(0, menuLayoutSubItem);
 				}
 				else
 				{
-					LoadMenuFlyoutItem(moreItem.Items, contextMenu, overflowItems, cancellationToken, showIcons);
+					LoadMenuFlyoutItem(moreItem.Items
+						?? throw new InvalidOperationException("The shell overflow menu has not been initialized."), contextMenu, overflowItems, cancellationToken, showIcons);
 				}
 			}
 
@@ -421,7 +420,9 @@ x.Tag is Win32ContextMenuItem menuItem &&
 				var itemsWithSubMenu = shellMenuItems.Where(x => x.LoadSubMenuAction is not null);
 				var subMenuTasks = itemsWithSubMenu.Select(async item =>
 				{
-					await item.LoadSubMenuAction();
+					var loadSubMenuAction = item.LoadSubMenuAction
+						?? throw new InvalidOperationException("The shell submenu loader is not available.");
+					await loadSubMenuAction();
 					if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu)
 					{
 						AddItemsToMainMenu(itemContextMenuFlyout.SecondaryCommands, item);
@@ -459,7 +460,9 @@ public static void AddItemsToOverflowMenu(AppBarButton? overflowItem, ContextMen
 				var flyoutSubItem = flyout.Items.FirstOrDefault(x => x.Tag == viewModel.Tag) as MenuFlyoutSubItem;
 				if (flyoutSubItem is not null)
 				{
-					viewModel.Items.ForEach(i => flyoutSubItem.Items.Add(ContextFlyoutModelToElementHelper.GetMenuItem(i)));
+					(viewModel.Items
+						?? throw new InvalidOperationException("The shell submenu has not been initialized."))
+						.ForEach(i => flyoutSubItem.Items.Add(ContextFlyoutModelToElementHelper.GetMenuItem(i)));
 					flyout.Items[flyout.Items.IndexOf(flyoutSubItem) + 1].Visibility = Visibility.Collapsed;
 					flyoutSubItem.Visibility = Visibility.Visible;
 				}
diff --git a/src/Files.App/Data/Items/AccessMaskItem.cs b/src/Files.App/Data/Items/AccessMaskItem.cs
index 8f5e1853cda6..9f781142deac 100644
--- a/src/Files.App/Data/Items/AccessMaskItem.cs
+++ b/src/Files.App/Data/Items/AccessMaskItem.cs
@@ -8,7 +8,7 @@ namespace Files.App.Data.Items
 	/// </summary>
 	public sealed partial class AccessMaskItem : ObservableObject
 	{
-		public string AccessMaskName { get; set; }
+		public string? AccessMaskName { get; set; }
 
 		public AccessMaskFlags AccessMask { get; set; }
 
diff --git a/src/Files.App/Data/Items/ContextMenu.cs b/src/Files.App/Data/Items/ContextMenu.cs
index 36532585196e..091657de6a25 100644
--- a/src/Files.App/Data/Items/ContextMenu.cs
+++ b/src/Files.App/Data/Items/ContextMenu.cs
@@ -22,16 +22,16 @@ public enum HBITMAP_HMENU : long
 
 	public class Win32ContextMenu
 	{
-		public List<Win32ContextMenuItem> Items { get; set; }
+		public List<Win32ContextMenuItem>? Items { get; set; }
 	}
 
 	public class Win32ContextMenuItem
 	{
-		public byte[] Icon { get; set; }
+		public byte[]? Icon { get; set; }
 		public int ID { get; set; } // Valid only in current menu to invoke item
-		public string Label { get; set; }
-		public string CommandString { get; set; }
+		public string? Label { get; set; }
+		public string? CommandString { get; set; }
 		public MENU_ITEM_TYPE Type { get; set; }
-		public List<Win32ContextMenuItem> SubItems { get; set; }
+		public List<Win32ContextMenuItem>? SubItems { get; set; }
 	}
 }
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
index 0b6b73c4041a..81fbb67ca637 100644
--- a/src/Files.App/Data/Items/DriveItem.cs
+++ b/src/Files.App/Data/Items/DriveItem.cs
@@ -14,8 +14,8 @@ namespace Files.App.Data.Items
 {
 	public sealed partial class DriveItem : ExpandableSidebarItemBase, INavigationControlItem, IFolder, IExpandableSidebarFolder
 	{
-		private BitmapImage icon;
-		public BitmapImage Icon
+		private BitmapImage? icon;
+		public BitmapImage? Icon
 		{
 			get => icon;
 			set
@@ -25,18 +25,18 @@ public BitmapImage Icon
 			}
 		}
 
-		public byte[] IconData { get; set; }
+		public byte[]? IconData { get; set; }
 
-		private string path;
-		public string Path
+		private string? path;
+		public string? Path
 		{
 			get => path;
 			set => path = value;
 		}
 
-		public string DeviceID { get; set; }
+		public string? DeviceID { get; set; }
 
-		public StorageFolder Root { get; set; }
+		public StorageFolder? Root { get; set; }
 
 		public NavigationControlItemType ItemType { get; set; } = NavigationControlItemType.Drive;
 
@@ -49,7 +49,7 @@ public bool IsNetwork
 			=> Type == DriveType.Network;
 
 		public bool IsPinned
-			=> App.QuickAccessManager.Model.PinnedFolders.Contains(Path);
+			=> Enumerable.Contains<string?>(App.QuickAccessManager.Model.PinnedFolders, Path);
 
 		public string MaxSpaceText
 			=> MaxSpace.ToSizeString();
@@ -137,15 +137,15 @@ public string Filesystem
 			set => SetProperty(ref filesystem, value);
 		}
 
-		private string text;
-		public string Text
+		private string? text;
+		public string? Text
 		{
 			get => text;
 			set => SetProperty(ref text, value);
 		}
 
-		private string spaceText;
-		public string SpaceText
+		private string? spaceText;
+		public string? SpaceText
 		{
 			get => spaceText;
 			set => SetProperty(ref spaceText, value);
@@ -153,7 +153,7 @@ public string SpaceText
 
 		public SectionType Section { get; set; }
 
-		public ContextMenuOptions MenuOptions { get; set; }
+		public ContextMenuOptions? MenuOptions { get; set; }
 
 		private float percentageUsed = 0.0f;
 		public float PercentageUsed
@@ -176,17 +176,20 @@ public bool ShowStorageSense
 			set => SetProperty(ref showStorageSense, value);
 		}
 
-		public string Id => Path;
-		public string Name => Root.DisplayName;
+		public string Id
+			=> Path ?? throw new InvalidOperationException("The drive path has not been initialized.");
+		public string Name => Root?.DisplayName
+			?? throw new InvalidOperationException("The drive root has not been initialized.");
 
 		public object? Children => IsExpandableFolder ? (childItems ??= []) : null;
 		private BulkConcurrentObservableCollection<INavigationControlItem>? childItems;
 
-		protected override string ExpansionPath => path;
+		protected override string ExpansionPath
+			=> path ?? throw new InvalidOperationException("The drive path has not been initialized.");
 		protected override BulkConcurrentObservableCollection<INavigationControlItem> EnsureChildItems() => childItems ??= [];
 
-		private object toolTip = "";
-		public object ToolTip
+		private object? toolTip = "";
+		public object? ToolTip
 		{
 			get => toolTip;
 			set
@@ -204,6 +207,8 @@ public IconElement? IconElement
 			}
 		}
 
+		FrameworkElement? ISidebarItemPresentationModel.IconElement => IconElement;
+
 		public FrameworkElement? ItemDecorator
 		{
 			get
@@ -232,10 +237,12 @@ public FrameworkElement? ItemDecorator
 
 		private void ItemDecorator_Click(object sender, RoutedEventArgs e)
 		{
-			DriveHelpers.EjectDeviceAsync(Path);
+			var drivePath = Path
+				?? throw new InvalidOperationException("The drive path has not been initialized.");
+			DriveHelpers.EjectDeviceAsync(drivePath);
 		}
 
-		public static async Task<DriveItem> CreateFromPropertiesAsync(StorageFolder root, string deviceId, string label, DriveType type, IRandomAccessStream imageStream = null)
+		public static async Task<DriveItem> CreateFromPropertiesAsync(StorageFolder root, string deviceId, string label, DriveType type, IRandomAccessStream? imageStream = null)
 		{
 			var item = new DriveItem();
 
@@ -268,9 +275,10 @@ public async Task UpdateLabelAsync()
 		{
 			try
 			{
-				var properties = await Root.Properties.RetrievePropertiesAsync(["System.ItemNameDisplay"])
+				var root = Root!;
+				var properties = await root.Properties.RetrievePropertiesAsync(["System.ItemNameDisplay"])
 					.AsTask().WithTimeoutAsync(TimeSpan.FromSeconds(5));
-				Text = (string)properties["System.ItemNameDisplay"];
+				Text = (string?)properties!["System.ItemNameDisplay"];
 			}
 			catch (NullReferenceException)
 			{
@@ -286,7 +294,9 @@ public async Task UpdatePropertiesAsync()
 				{
 					try
 					{
-						var syncRootStatus = await SyncRootHelpers.GetSyncRootQuotaAsync(Path);
+						var drivePath = Path
+							?? throw new InvalidOperationException("The drive path has not been initialized.");
+						var syncRootStatus = await SyncRootHelpers.GetSyncRootQuotaAsync(drivePath);
 						if (syncRootStatus.Success)
 						{
 							MaxSpace = ByteSize.FromBytes(syncRootStatus.Capacity);
@@ -305,7 +315,8 @@ public async Task UpdatePropertiesAsync()
 					catch { }
 				}
 
-				var properties = await Root.Properties.RetrievePropertiesAsync(["System.FreeSpace", "System.Capacity", "System.Volume.FileSystem"])
+				var root = Root ?? throw new InvalidOperationException("The drive root has not been initialized.");
+				var properties = await root.Properties.RetrievePropertiesAsync(["System.FreeSpace", "System.Capacity", "System.Volume.FileSystem"])
 					.AsTask().WithTimeoutAsync(TimeSpan.FromSeconds(5));
 
 				if (properties is not null && properties["System.Capacity"] is not null && properties["System.FreeSpace"] is not null)
@@ -350,8 +361,13 @@ public async IAsyncEnumerable<IStorableChild> GetItemsAsync(StorableType storabl
 
 		public int CompareTo(INavigationControlItem? other)
 		{
+			ArgumentNullException.ThrowIfNull(other);
+			var text = Text ?? throw new InvalidOperationException("The drive name has not been initialized.");
+			var otherText = other.Text
+				?? throw new ArgumentException("The compared item must have a name.", nameof(other));
+
 			var result = Type.CompareTo((other as DriveItem)?.Type ?? Type);
-			return result == 0 ? Text.CompareTo(other.Text) : result;
+			return result == 0 ? text.CompareTo(otherText) : result;
 		}
 
 		public async Task LoadThumbnailAsync()
diff --git a/src/Files.App/Data/Items/FileTagItem.cs b/src/Files.App/Data/Items/FileTagItem.cs
index 3171a7e28ce4..47b21be3d21f 100644
--- a/src/Files.App/Data/Items/FileTagItem.cs
+++ b/src/Files.App/Data/Items/FileTagItem.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using CommunityToolkit.WinUI.Helpers;
+using Files.App.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;
@@ -11,10 +12,10 @@ namespace Files.App.Data.Items
 {
 	public sealed partial class FileTagItem : ObservableObject, INavigationControlItem
 	{
-		public string Text { get; set; }
+		public string? Text { get; set; }
 
-		private string path;
-		public string Path
+		private string? path;
+		public string? Path
 		{
 			get => path;
 			set
@@ -25,19 +26,25 @@ public string Path
 			}
 		}
 
-		public string ToolTipText { get; private set; }
+		public string? ToolTipText { get; private set; }
 
 		public SectionType Section { get; set; }
 
-		public ContextMenuOptions MenuOptions { get; set; }
+		public ContextMenuOptions? MenuOptions { get; set; }
 
 		public NavigationControlItemType ItemType
 			=> NavigationControlItemType.FileTag;
 
 		public int CompareTo(INavigationControlItem? other)
-			=> Text.CompareTo(other.Text);
+		{
+			var text = Text ?? throw new InvalidOperationException("The file tag name has not been initialized.");
+			var otherText = other?.Text
+				?? throw new ArgumentException("The compared item must have a name.", nameof(other));
+
+			return text.CompareTo(otherText);
+		}
 
-		public TagViewModel FileTag { get; set; }
+		public TagViewModel? FileTag { get; set; }
 
 		public object? Children => null;
 
@@ -48,13 +55,18 @@ public IconElement? IconElement
 				var source = new PathIconSource()
 				{
 					Data = (Geometry)XamlBindingHelper.ConvertValue(typeof(Geometry), (string)Application.Current.Resources["App.Theme.PathIcon.FilledTag"]),
-					Foreground = new SolidColorBrush(FileTag.Color.ToColor())
+					Foreground = new SolidColorBrush((FileTag
+						?? throw new InvalidOperationException("The file tag has not been initialized.")).Color.ToColor())
 				};
 				return source.CreateIconElement();
 			}
 		}
 
-		public object ToolTip => Text;
+		FrameworkElement? ISidebarItemPresentationModel.IconElement => IconElement;
+
+		public object? ToolTip => Text;
+
+		FrameworkElement? ISidebarItemPresentationModel.ItemDecorator => null;
 
 		public bool IsExpanded { get => false; set { } }
 	}
diff --git a/src/Files.App/Data/Items/IListedItem.cs b/src/Files.App/Data/Items/IListedItem.cs
index 3864f34f5bbd..464041d89258 100644
--- a/src/Files.App/Data/Items/IListedItem.cs
+++ b/src/Files.App/Data/Items/IListedItem.cs
@@ -3,32 +3,34 @@
 
 using Files.App.ViewModels.Properties;
 using Microsoft.UI.Xaml.Media.Imaging;
+using System.Diagnostics.CodeAnalysis;
 using Windows.Storage;
 
 namespace Files.App.Utils
 {
 	public interface IListedItem
 	{
-		GitItem AsGitItem { get; }
-		RecycleBinItem AsRecycleBinItem { get; }
+		GitItem? AsGitItem { get; }
+		RecycleBinItem? AsRecycleBinItem { get; }
 		bool ContainsFilesOrFolders { get; set; }
-		string ContextualProperty { get; set; }
-		BitmapImage CustomIcon { get; set; }
-		Uri CustomIconSource { get; set; }
-		ObservableCollection<FileProperty> FileDetails { get; set; }
-		string FileExtension { get; set; }
+		string? ContextualProperty { get; set; }
+		BitmapImage? CustomIcon { get; set; }
+		Uri? CustomIconSource { get; set; }
+		ObservableCollection<FileProperty>? FileDetails { get; set; }
+		string? FileExtension { get; set; }
 		ulong? FileFRN { get; set; }
-		BitmapImage FileImage { get; set; }
-		string FileSize { get; set; }
+		BitmapImage? FileImage { get; set; }
+		string? FileSize { get; set; }
 		long FileSizeBytes { get; set; }
 		string FileSizeDisplay { get; }
-		string[] FileTags { get; set; }
+		[DisallowNull]
+		string[]? FileTags { get; set; }
 		IList<TagViewModel>? FileTagsUI { get; }
-		string FileVersion { get; set; }
-		string FolderRelativeId { get; set; }
+		string? FileVersion { get; set; }
+		string? FolderRelativeId { get; set; }
 		bool HasTags { get; set; }
-		BitmapImage IconOverlay { get; set; }
-		string ImageDimensions { get; set; }
+		BitmapImage? IconOverlay { get; set; }
+		string? ImageDimensions { get; set; }
 		bool IsAlternateStream { get; }
 		bool IsArchive { get; }
 		bool IsDriveRoot { get; }
@@ -45,29 +47,29 @@ public interface IListedItem
 		bool IsRecycleBinItem { get; }
 		bool IsScriptFile { get; }
 		bool IsShortcut { get; }
-		string ItemDateAccessed { get; }
+		string? ItemDateAccessed { get; }
 		DateTimeOffset ItemDateAccessedReal { get; set; }
-		string ItemDateCreated { get; }
+		string? ItemDateCreated { get; }
 		DateTimeOffset ItemDateCreatedReal { get; set; }
-		string ItemDateModified { get; }
+		string? ItemDateModified { get; }
 		DateTimeOffset ItemDateModifiedReal { get; set; }
-		BaseStorageFile ItemFile { get; set; }
-		string ItemNameRaw { get; set; }
-		string ItemPath { get; set; }
-		ObservableCollection<FileProperty> ItemProperties { get; set; }
+		BaseStorageFile? ItemFile { get; set; }
+		string? ItemNameRaw { get; set; }
+		string? ItemPath { get; set; }
+		ObservableCollection<FileProperty>? ItemProperties { get; set; }
 		bool ItemPropertiesInitialized { get; set; }
 		string ItemTooltipText { get; }
-		string ItemType { get; set; }
-		string Key { get; set; }
+		string? ItemType { get; set; }
+		string? Key { get; set; }
 		bool LoadCustomIcon { get; set; }
 		bool LoadFileIcon { get; set; }
 		ByteSizeLib.ByteSize MaxSpace { get; set; }
-		string MediaDuration { get; set; }
-		string Name { get; }
+		string? MediaDuration { get; set; }
+		string? Name { get; }
 		bool NeedsPlaceholderGlyph { get; set; }
 		double Opacity { get; set; }
 		StorageItemTypes PrimaryItemAttribute { get; set; }
-		BitmapImage ShieldIcon { get; set; }
+		BitmapImage? ShieldIcon { get; set; }
 		bool ShowDriveStorageDetails { get; set; }
 		ByteSizeLib.ByteSize SpaceUsed { get; set; }
 		string SyncStatusString { get; }
@@ -76,4 +78,18 @@ public interface IListedItem
 		string ToString();
 		void UpdateContainsFilesFolders();
 	}
-}
\ No newline at end of file
+
+	internal static class ListedItemExtensions
+	{
+		extension(IListedItem item)
+		{
+			public string GetRequiredPath()
+			{
+				ArgumentNullException.ThrowIfNull(item);
+
+				return item.ItemPath
+					?? throw new InvalidOperationException("The listed item does not have a path.");
+			}
+		}
+	}
+}
diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs
index d3a94b71d753..09fb3cb8f20b 100644
--- a/src/Files.App/Data/Items/ListedItem.cs
+++ b/src/Files.App/Data/Items/ListedItem.cs
@@ -6,6 +6,7 @@
 using FluentFTP;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media.Imaging;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text;
 using Windows.Storage;
@@ -62,7 +63,7 @@ public string ItemTooltipText
 			}
 		}
 
-		public string FolderRelativeId { get; set; }
+		public string? FolderRelativeId { get; set; }
 
 		public bool ContainsFilesOrFolders { get; set; } = true;
 
@@ -89,8 +90,8 @@ public bool LoadCustomIcon
 
 		// Note: Never attempt to call this from a secondary window or another thread, create a new instance from CustomIconSource instead
 		// TODO: eventually we should remove this b/c it's not thread safe
-		private BitmapImage customIcon;
-		public BitmapImage CustomIcon
+		private BitmapImage? customIcon;
+		public BitmapImage? CustomIcon
 		{
 			get => customIcon;
 			set
@@ -102,8 +103,9 @@ public BitmapImage CustomIcon
 
 		public ulong? FileFRN { get; set; }
 
-		private string[] fileTags = null!;
-		public string[] FileTags
+		private string[]? fileTags;
+		[DisallowNull]
+		public string[]? FileTags
 		{
 			get => fileTags;
 			set
@@ -112,17 +114,16 @@ public string[] FileTags
 				var fileTagsInitialized = fileTags is not null;
 				if (SetProperty(ref fileTags, value))
 				{
-					Debug.Assert(value != null);
-
 					// only set the tags if the file tags have been changed
 					if (fileTagsInitialized)
 					{
+						var path = this.GetRequiredPath();
 						var dbInstance = FileTagsHelper.GetDbInstance();
-						dbInstance.SetTags(ItemPath, FileFRN, value);
-						FileTagsHelper.WriteFileTag(ItemPath, value);
+						dbInstance.SetTags(path, FileFRN, value);
+						FileTagsHelper.WriteFileTag(path, value);
 					}
 
-					HasTags = !FileTags.IsEmpty();
+					HasTags = !value.IsEmpty();
 					OnPropertyChanged(nameof(FileTagsUI));
 				}
 			}
@@ -133,8 +134,8 @@ public IList<TagViewModel>? FileTagsUI
 			get => fileTagsSettingsService.GetTagsByIds(FileTags);
 		}
 
-		private Uri customIconSource;
-		public Uri CustomIconSource
+		private Uri? customIconSource;
+		public Uri? CustomIconSource
 		{
 			get => customIconSource;
 			set => SetProperty(ref customIconSource, value);
@@ -176,8 +177,8 @@ public string SyncStatusString
 			get => string.IsNullOrEmpty(SyncStatusUI?.SyncStatusString) ? Strings.CloudDriveSyncStatus_Unknown.GetLocalizedResource() : SyncStatusUI.SyncStatusString;
 		}
 
-		private BitmapImage fileImage;
-		public BitmapImage FileImage
+		private BitmapImage? fileImage;
+		public BitmapImage? FileImage
 		{
 			get => fileImage;
 			set
@@ -193,10 +194,17 @@ public BitmapImage FileImage
 			}
 		}
 
-		public bool IsItemPinnedToStart => StartMenuService.IsPinned((this as IShortcutItem)?.TargetPath ?? ItemPath);
+		public bool IsItemPinnedToStart
+		{
+			get
+			{
+				var targetPath = (this as IShortcutItem)?.TargetPath;
+				return StartMenuService.IsPinned(!string.IsNullOrEmpty(targetPath) ? targetPath : this.GetRequiredPath());
+			}
+		}
 
-		private BitmapImage iconOverlay;
-		public BitmapImage IconOverlay
+		private BitmapImage? iconOverlay;
+		public BitmapImage? IconOverlay
 		{
 			get => iconOverlay;
 			set
@@ -208,8 +216,8 @@ public BitmapImage IconOverlay
 			}
 		}
 
-		private BitmapImage shieldIcon;
-		public BitmapImage ShieldIcon
+		private BitmapImage? shieldIcon;
+		public BitmapImage? ShieldIcon
 		{
 			get => shieldIcon;
 			set
@@ -221,15 +229,15 @@ public BitmapImage ShieldIcon
 			}
 		}
 
-		private string itemPath;
-		public string ItemPath
+		private string? itemPath;
+		public string? ItemPath
 		{
 			get => itemPath;
 			set => SetProperty(ref itemPath, value);
 		}
 
-		private string itemNameRaw;
-		public string ItemNameRaw
+		private string? itemNameRaw;
+		public string? ItemNameRaw
 		{
 			get => itemNameRaw;
 			set
@@ -241,7 +249,7 @@ public string ItemNameRaw
 			}
 		}
 
-		public virtual string Name
+		public virtual string? Name
 		{
 			get
 			{
@@ -257,8 +265,8 @@ public virtual string Name
 			}
 		}
 
-		private string itemType;
-		public string ItemType
+		private string? itemType;
+		public string? ItemType
 		{
 			get => itemType;
 			set
@@ -270,10 +278,10 @@ public string ItemType
 			}
 		}
 
-		public string FileExtension { get; set; }
+		public string? FileExtension { get; set; }
 
-		private string fileSize;
-		public string FileSize
+		private string? fileSize;
+		public string? FileSize
 		{
 			get => fileSize;
 			set
@@ -289,7 +297,7 @@ public string FileSize
 
 		public bool ShowViewSizeButton => !IsCalculatingSize && string.IsNullOrEmpty(FileSize) && PrimaryItemAttribute == StorageItemTypes.Folder;
 
-		public string SizeText => ShowCalculatingText ? Strings.Calculating.GetLocalizedResource() : FileSize;
+		public string? SizeText => ShowCalculatingText ? Strings.Calculating.GetLocalizedResource() : FileSize;
 
 		private bool isCalculatingSize;
 		public bool IsCalculatingSize
@@ -315,22 +323,22 @@ public bool ShowCalculatingText
 
 		public long FileSizeBytes { get; set; }
 
-		private string itemDateModified;
-		public string ItemDateModified
+		private string? itemDateModified;
+		public string? ItemDateModified
 		{
 			get => itemDateModified;
 			private set => SetProperty(ref itemDateModified, value);
 		}
 
-		private string itemDateCreated;
-		public string ItemDateCreated
+		private string? itemDateCreated;
+		public string? ItemDateCreated
 		{
 			get => itemDateCreated;
 			private set => SetProperty(ref itemDateCreated, value);
 		}
 
-		private string itemDateAccessed;
-		public string ItemDateAccessed
+		private string? itemDateAccessed;
+		public string? ItemDateAccessed
 		{
 			get => itemDateAccessed;
 			private set => SetProperty(ref itemDateAccessed, value);
@@ -369,8 +377,8 @@ public DateTimeOffset ItemDateAccessedReal
 			}
 		}
 
-		private ObservableCollection<FileProperty> itemProperties;
-		public ObservableCollection<FileProperty> ItemProperties
+		private ObservableCollection<FileProperty>? itemProperties;
+		public ObservableCollection<FileProperty>? ItemProperties
 		{
 			get => itemProperties;
 			set => SetProperty(ref itemProperties, value);
@@ -399,22 +407,22 @@ public ByteSize SpaceUsed
 
 		}
 
-		private string imageDimensions;
-		public string ImageDimensions
+		private string? imageDimensions;
+		public string? ImageDimensions
 		{
 			get => imageDimensions;
 			set => SetProperty(ref imageDimensions, value);
 		}
 
-		private string fileVersion;
-		public string FileVersion
+		private string? fileVersion;
+		public string? FileVersion
 		{
 			get => fileVersion;
 			set => SetProperty(ref fileVersion, value);
 		}
 
-		private string mediaDuration;
-		public string MediaDuration
+		private string? mediaDuration;
+		public string? MediaDuration
 		{
 			get => mediaDuration;
 			set => SetProperty(ref mediaDuration, value);
@@ -423,8 +431,8 @@ public string MediaDuration
 		/// <summary>
 		/// Contextual property that changes based on the item type.
 		/// </summary>
-		private string contextualProperty;
-		public string ContextualProperty
+		private string? contextualProperty;
+		public string? ContextualProperty
 		{
 			get => contextualProperty;
 			set => SetProperty(ref contextualProperty, value);
@@ -434,13 +442,13 @@ public string ContextualProperty
 		/// Initializes a new instance of the <see cref="ListedItem" /> class.
 		/// </summary>
 		/// <param name="folderRelativeId"></param>
-		public ListedItem(string folderRelativeId) => FolderRelativeId = folderRelativeId;
+		public ListedItem(string? folderRelativeId) => FolderRelativeId = folderRelativeId;
 
 		// Parameterless constructor for JsonConvert
 		public ListedItem() { }
 
-		private ObservableCollection<FileProperty> fileDetails;
-		public ObservableCollection<FileProperty> FileDetails
+		private ObservableCollection<FileProperty>? fileDetails;
+		public ObservableCollection<FileProperty>? FileDetails
 		{
 			get => fileDetails;
 			set => SetProperty(ref fileDetails, value);
@@ -480,23 +488,23 @@ public override string ToString()
 		public bool IsGitItem => this is IGitItem;
 		public virtual bool IsExecutable => !IsFolder && FileExtensionHelpers.IsExecutableFile(ItemPath);
 		public virtual bool IsScriptFile => FileExtensionHelpers.IsScriptFile(ItemPath);
-		public bool IsPinned => App.QuickAccessManager.Model.PinnedFolders.Contains(itemPath);
+		public bool IsPinned => App.QuickAccessManager.Model.PinnedFolders.Contains(this.GetRequiredPath());
 		public bool IsDriveRoot => ItemPath == PathNormalization.GetPathRoot(ItemPath);
 		public bool IsElevationRequired { get; set; }
 
-		private BaseStorageFile itemFile;
-		public BaseStorageFile ItemFile
+		private BaseStorageFile? itemFile;
+		public BaseStorageFile? ItemFile
 		{
 			get => itemFile;
 			set => SetProperty(ref itemFile, value);
 		}
 
 		// This is a hack used because x:Bind casting did not work properly
-		public RecycleBinItem AsRecycleBinItem => this as RecycleBinItem;
+		public RecycleBinItem? AsRecycleBinItem => this as RecycleBinItem;
 
-		public GitItem AsGitItem => this as GitItem;
+		public GitItem? AsGitItem => this as GitItem;
 
-		public string Key { get; set; }
+		public string? Key { get; set; }
 
 		public virtual bool IsRealChanges =>  ItemDateAccessed != dateTimeFormatter.ToShortLabel(ItemDateAccessedReal)
 			|| ItemDateCreated != dateTimeFormatter.ToShortLabel(ItemDateCreatedReal)
@@ -515,18 +523,18 @@ public virtual void UpdateReal()
 		/// </summary>
 		public void UpdateContainsFilesFolders()
 		{
-			ContainsFilesOrFolders = FolderHelpers.CheckForFilesFolders(ItemPath);
+			ContainsFilesOrFolders = FolderHelpers.CheckForFilesFolders(this.GetRequiredPath());
 		}
 	}
 
 	public sealed partial class RecycleBinItem : ListedItem
 	{
-		public RecycleBinItem(string folderRelativeId) : base(folderRelativeId)
+		public RecycleBinItem(string? folderRelativeId) : base(folderRelativeId)
 		{
 		}
 
-		private string itemDateDeleted;
-		public string ItemDateDeleted
+		private string? itemDateDeleted;
+		public string? ItemDateDeleted
 		{
 			get => itemDateDeleted;
 			private set
@@ -559,12 +567,12 @@ public override void UpdateReal()
 		private DateTimeOffset itemDateDeletedReal;
 
 		// For recycle bin elements (path + name)
-		public string ItemOriginalPath { get; set; }
+		public string? ItemOriginalPath { get; set; }
 
 		// For recycle bin elements (path)
-		public string ItemOriginalFolder => Path.IsPathRooted(ItemOriginalPath) ? Path.GetDirectoryName(ItemOriginalPath) : ItemOriginalPath;
+		public string? ItemOriginalFolder => Path.IsPathRooted(ItemOriginalPath) ? Path.GetDirectoryName(ItemOriginalPath) : ItemOriginalPath;
 
-		public string ItemOriginalFolderName => Path.GetFileName(ItemOriginalFolder);
+		public string? ItemOriginalFolderName => Path.GetFileName(ItemOriginalFolder);
 	}
 
 	public sealed partial class FtpItem : ListedItem
@@ -581,7 +589,7 @@ public FtpItem(FtpListItem item, string folder) : base(null)
 			ItemPropertiesInitialized = false;
 
 			var itemType = isFile ? Strings.File.GetLocalizedResource() : Strings.Folder.GetLocalizedResource();
-			if (isFile && Name.Contains('.', StringComparison.Ordinal))
+			if (isFile && item.Name.Contains('.', StringComparison.Ordinal))
 			{
 				itemType = FileExtension.Trim('.') + " " + itemType;
 			}
@@ -590,22 +598,28 @@ public FtpItem(FtpListItem item, string folder) : base(null)
 			FileSizeBytes = item.Size;
 			ContainsFilesOrFolders = !isFile;
 			FileImage = null;
-			FileSize = isFile ? FileSizeBytes.ToSizeString() : null;
+			FileSize = isFile ? FileSizeBytes.ToSizeString() : string.Empty;
 			Opacity = 1;
 			IsHiddenItem = false;
 		}
 
-		public async Task<IStorageItem> ToStorageItem() => PrimaryItemAttribute switch
+		public async Task<IStorageItem> ToStorageItem()
 		{
-			StorageItemTypes.File => await new Utils.Storage.FtpStorageFile(ItemPath, ItemNameRaw, ItemDateCreatedReal).ToStorageFileAsync(),
-			StorageItemTypes.Folder => new Utils.Storage.FtpStorageFolder(ItemPath, ItemNameRaw, ItemDateCreatedReal),
-			_ => throw new InvalidDataException(),
-		};
+			var path = this.GetRequiredPath();
+			var name = ItemNameRaw ?? throw new InvalidOperationException("The FTP item does not have a name.");
+
+			return PrimaryItemAttribute switch
+			{
+				StorageItemTypes.File => await new Utils.Storage.FtpStorageFile(path, name, ItemDateCreatedReal).ToStorageFileAsync(),
+				StorageItemTypes.Folder => new Utils.Storage.FtpStorageFolder(path, name, ItemDateCreatedReal),
+				_ => throw new InvalidDataException("The FTP item has an unsupported storage type."),
+			};
+		}
 	}
 
 	public sealed partial class ShortcutItem : ListedItem, IShortcutItem
 	{
-		public ShortcutItem(string folderRelativeId) : base(folderRelativeId)
+		public ShortcutItem(string? folderRelativeId) : base(folderRelativeId)
 		{
 		}
 
@@ -614,13 +628,13 @@ public ShortcutItem() : base()
 		{ }
 
 		// For shortcut elements (.lnk and .url)
-		public string TargetPath { get; set; }
+		public string? TargetPath { get; set; }
 
-		public override string Name
+		public override string? Name
 			=> IsSymLink ? base.Name : Path.GetFileNameWithoutExtension(ItemNameRaw); // Always hide extension for shortcuts
 
-		public string Arguments { get; set; }
-		public string WorkingDirectory { get; set; }
+		public string? Arguments { get; set; }
+		public string? WorkingDirectory { get; set; }
 		public bool RunAsAdmin { get; set; }
 		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 		public bool IsUrl { get; set; }
@@ -631,11 +645,11 @@ public override string Name
 
 	public sealed partial class ZipItem : ListedItem
 	{
-		public ZipItem(string folderRelativeId) : base(folderRelativeId)
+		public ZipItem(string? folderRelativeId) : base(folderRelativeId)
 		{
 		}
 
-		public override string Name
+		public override string? Name
 		{
 			get
 			{
@@ -673,19 +687,26 @@ public LibraryItem(LibraryLocationItem library) : base(null)
 
 		public bool IsEmpty { get; }
 
-		public string DefaultSaveFolder { get; }
+		public string? DefaultSaveFolder { get; }
 
-		public override string Name => ItemNameRaw;
+		public override string? Name => ItemNameRaw;
 
 		public ReadOnlyCollection<string> Folders { get; }
 	}
 
 	public sealed partial class AlternateStreamItem : ListedItem
 	{
-		public string MainStreamPath => ItemPath.Substring(0, ItemPath.LastIndexOf(':'));
+		public string MainStreamPath
+		{
+			get
+			{
+				var path = this.GetRequiredPath();
+				return path.Substring(0, path.LastIndexOf(':'));
+			}
+		}
 		public string MainStreamName => Path.GetFileName(MainStreamPath);
 
-		public override string Name
+		public override string? Name
 		{
 			get
 			{
@@ -794,13 +815,13 @@ public string? GitLastCommitFullSha
 	}
 	public sealed partial class GitShortcutItem : GitItem, IShortcutItem
 	{
-		public string TargetPath { get; set; }
+		public string? TargetPath { get; set; }
 
 		public override string Name
-			=> IsSymLink ? base.Name : Path.GetFileNameWithoutExtension(ItemNameRaw); // Always hide extension for shortcuts
+			=> IsSymLink ? base.Name! : Path.GetFileNameWithoutExtension(ItemNameRaw)!; // Always hide extension for shortcuts
 
-		public string Arguments { get; set; }
-		public string WorkingDirectory { get; set; }
+		public string? Arguments { get; set; }
+		public string? WorkingDirectory { get; set; }
 		public bool RunAsAdmin { get; set; }
 		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 		public bool IsUrl { get; set; }
@@ -831,9 +852,9 @@ public interface IGitItem : IListedItem
 	}
 	public interface IShortcutItem : IListedItem
 	{
-		public string TargetPath { get; set; }
-		public string Arguments { get; set; }
-		public string WorkingDirectory { get; set; }
+		public string? TargetPath { get; set; }
+		public string? Arguments { get; set; }
+		public string? WorkingDirectory { get; set; }
 		public bool RunAsAdmin { get; set; }
 		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 		public bool IsUrl { get; set; }
diff --git a/src/Files.App/Data/Items/LocationItem.cs b/src/Files.App/Data/Items/LocationItem.cs
index 6df43a36c31e..4c80bc83f328 100644
--- a/src/Files.App/Data/Items/LocationItem.cs
+++ b/src/Files.App/Data/Items/LocationItem.cs
@@ -14,8 +14,8 @@ namespace Files.App.Data.Items
 {
 	public partial class LocationItem : ExpandableSidebarItemBase, INavigationControlItem, IExpandableSidebarFolder
 	{
-		public BitmapImage icon;
-		public BitmapImage Icon
+		public BitmapImage? icon;
+		public BitmapImage? Icon
 		{
 			get => icon;
 			set
@@ -25,7 +25,7 @@ public BitmapImage Icon
 			}
 		}
 
-		public byte[] IconData { get; set; }
+		public byte[]? IconData { get; set; }
 
 		private string text = "";
 		public string Text
@@ -40,22 +40,23 @@ public string Text
 			}
 		}
 
-		private string path;
-		public string Path
+		private string? path;
+		public string? Path
 		{
 			get => path;
 			set
 			{
 				path = value;
-				ToolTip = string.IsNullOrEmpty(Path) ||
-					Path.Contains('?', StringComparison.Ordinal) ||
-					Path.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) ||
-					Path.EndsWith(ShellLibraryItem.EXTENSION, StringComparison.OrdinalIgnoreCase) ||
-					Path == "Home" ||
-					Path == "ReleaseNotes" ||
-					Path == "Settings"
+				var currentPath = value;
+				ToolTip = string.IsNullOrEmpty(currentPath) ||
+					currentPath.Contains('?', StringComparison.Ordinal) ||
+					currentPath.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) ||
+					currentPath.EndsWith(ShellLibraryItem.EXTENSION, StringComparison.OrdinalIgnoreCase) ||
+					currentPath == "Home" ||
+					currentPath == "ReleaseNotes" ||
+					currentPath == "Settings"
 					? Text
-					: Path;
+					: currentPath;
 			}
 		}
 
@@ -77,7 +78,8 @@ public object? Children
 		}
 		public BulkConcurrentObservableCollection<INavigationControlItem>? ChildItems { get; set; }
 
-		protected override string ExpansionPath => path;
+		protected override string ExpansionPath
+			=> path ?? throw new InvalidOperationException("The location path has not been initialized.");
 		protected override BulkConcurrentObservableCollection<INavigationControlItem> EnsureChildItems() => ChildItems ??= [];
 
 		public IconElement? IconElement
@@ -92,6 +94,8 @@ public IconElement? IconElement
 			}
 		}
 
+		FrameworkElement? ISidebarItemPresentationModel.IconElement => IconElement;
+
 		public bool SelectsOnInvoked { get; set; } = true;
 
 		// Shared by LocationItem + DriveItem. Enumerates off the UI thread, dispatches a single AddRange (one CollectionChanged event instead of N), paints with the cached generic folder icon, then upgrades per-path icons in the background. onLoaded runs on the UI thread alongside the AddRange so callers can flip their loaded/unrealized flags atomically with the visual update.
@@ -222,7 +226,7 @@ internal static LocationItem CreateSubfolder(SubfolderEntry entry, BitmapImage?
 				IsExpandableFolder = true,
 				HasUnrealizedChildren = entry.HasSubfolders,
 				IsHidden = entry.IsHidden,
-				Icon = sharedIcon!,
+				Icon = sharedIcon,
 				MenuOptions = new ContextMenuOptions
 				{
 					IsLocationItem = true,
@@ -236,11 +240,11 @@ internal static LocationItem CreateSubfolder(SubfolderEntry entry, BitmapImage?
 
 		public bool IsInvalid { get; set; } = false;
 
-		public bool IsPinned => App.QuickAccessManager.Model.PinnedFolders.Contains(path);
+		public bool IsPinned => Enumerable.Contains<string?>(App.QuickAccessManager.Model.PinnedFolders, path);
 
 		public SectionType Section { get; set; }
 
-		public ContextMenuOptions MenuOptions { get; set; }
+		public ContextMenuOptions? MenuOptions { get; set; }
 
 		public bool IsHeader { get; set; }
 
@@ -257,7 +261,12 @@ public virtual object ToolTip
 		public FrameworkElement? ItemDecorator => null;
 
 		public int CompareTo(INavigationControlItem? other)
-			=> Text.CompareTo(other.Text);
+		{
+			var otherText = other?.Text
+				?? throw new ArgumentException("The compared item must have a name.", nameof(other));
+
+			return Text.CompareTo(otherText);
+		}
 
 		public static T Create<T>() where T : LocationItem, new()
 		{
diff --git a/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs b/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs
index f5eb7895a255..118946925e34 100644
--- a/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs
+++ b/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs
@@ -98,7 +98,7 @@ private void UpdatePrimaryDisplay()
 			}
 		}
 
-		public string GetTextMemberPath(string textMemberPath)
+		public string? GetTextMemberPath(string textMemberPath)
 		{
 			return textMemberPath switch
 			{
diff --git a/src/Files.App/Data/Items/ShellFileItem.cs b/src/Files.App/Data/Items/ShellFileItem.cs
index ead2e56294da..1f9251f0e822 100644
--- a/src/Files.App/Data/Items/ShellFileItem.cs
+++ b/src/Files.App/Data/Items/ShellFileItem.cs
@@ -7,11 +7,11 @@ public class ShellFileItem
 	{
 		public bool IsFolder { get; set; }
 
-		public string RecyclePath { get; set; }
+		public string? RecyclePath { get; set; }
 
-		public string FileName { get; set; }
+		public string? FileName { get; set; }
 
-		public string FilePath { get; set; }
+		public string? FilePath { get; set; }
 
 		public DateTime RecycleDate { get; set; }
 
@@ -19,13 +19,13 @@ public class ShellFileItem
 
 		public DateTime CreatedDate { get; set; }
 
-		public string FileSize { get; set; }
+		public string? FileSize { get; set; }
 
 		public ulong FileSizeBytes { get; set; }
 
-		public string FileType { get; set; }
+		public string? FileType { get; set; }
 
-		public byte[] PIDL { get; set; } // Low level shell item identifier
+		public byte[]? PIDL { get; set; } // Low level shell item identifier
 
 		public Dictionary<string, object?> Properties { get; set; }
 
@@ -34,7 +34,7 @@ public ShellFileItem()
 			Properties = [];
 		}
 
-		public ShellFileItem(bool isFolder, string recyclePath, string fileName, string filePath, DateTime recycleDate, DateTime modifiedDate, DateTime createdDate, string fileSize, ulong fileSizeBytes, string fileType, byte[] pidl) : this()
+		public ShellFileItem(bool isFolder, string? recyclePath, string? fileName, string? filePath, DateTime recycleDate, DateTime modifiedDate, DateTime createdDate, string? fileSize, ulong fileSizeBytes, string? fileType, byte[] pidl) : this()
 		{
 			IsFolder = isFolder;
 			RecyclePath = recyclePath;
diff --git a/src/Files.App/Data/Items/ShellLibraryItem.cs b/src/Files.App/Data/Items/ShellLibraryItem.cs
index d6a11e5ecd98..677995f35012 100644
--- a/src/Files.App/Data/Items/ShellLibraryItem.cs
+++ b/src/Files.App/Data/Items/ShellLibraryItem.cs
@@ -15,7 +15,7 @@ public sealed class ShellLibraryItem
 		/// C:\Users\[username]\AppData\Roaming\Microsoft\Windows\Libraries\Documents.library-ms<br/>
 		/// C:\Users\[username]\AppData\Roaming\Microsoft\Windows\Libraries\Custom library.library-ms
 		/// </summary>
-		public string FullPath { get; set; }
+		public string? FullPath { get; set; }
 
 		/// <summary>
 		/// ShellItemDisplayString.DesktopAbsoluteParsing<br/>
@@ -23,7 +23,7 @@ public sealed class ShellLibraryItem
 		/// ::{031E4825-7B94-4DC3-B131-E946B44C8DD5}\Documents.library-ms<br/>
 		/// C:\Users\[username]\AppData\Roaming\Microsoft\Windows\Libraries\Custom library.library-ms
 		/// </summary>
-		public string AbsolutePath { get; set; }
+		public string? AbsolutePath { get; set; }
 
 		/// <summary>
 		/// ShellItemDisplayString.ParentRelativeParsing<br/>
@@ -31,7 +31,7 @@ public sealed class ShellLibraryItem
 		/// {7B0DB17D-9CD2-4A93-9733-46CC89022E7C}<br/>
 		/// Custom library.library-ms
 		/// </summary>
-		public string RelativePath { get; set; }
+		public string? RelativePath { get; set; }
 
 		/// <summary>
 		/// ShellItemDisplayString.NormalDisplay<br/>
@@ -39,13 +39,13 @@ public sealed class ShellLibraryItem
 		/// Documents (locale dependent based on desktop.ini file of the Libraries folder)<br/>
 		/// Custom library (locale independent)
 		/// </summary>
-		public string DisplayName { get; set; }
+		public string? DisplayName { get; set; }
 
 		public bool IsPinned { get; set; }
 
-		public string DefaultSaveFolder { get; set; }
+		public string? DefaultSaveFolder { get; set; }
 
-		public string[] Folders { get; set; }
+		public string[]? Folders { get; set; }
 
 		public ShellLibraryItem()
 		{
diff --git a/src/Files.App/Data/Items/ShellLinkItem.cs b/src/Files.App/Data/Items/ShellLinkItem.cs
index dc0acda2b37b..b169146fa66f 100644
--- a/src/Files.App/Data/Items/ShellLinkItem.cs
+++ b/src/Files.App/Data/Items/ShellLinkItem.cs
@@ -7,11 +7,11 @@ namespace Files.App.Data.Items
 {
 	public sealed class ShellLinkItem : ShellFileItem
 	{
-		public string TargetPath { get; set; }
+		public string? TargetPath { get; set; }
 
-		public string Arguments { get; set; }
+		public string? Arguments { get; set; }
 
-		public string WorkingDirectory { get; set; }
+		public string? WorkingDirectory { get; set; }
 
 		public bool RunAsAdmin { get; set; }
 
diff --git a/src/Files.App/Data/Items/ShellNewEntry.cs b/src/Files.App/Data/Items/ShellNewEntry.cs
index 8c753737faad..f6e140383e70 100644
--- a/src/Files.App/Data/Items/ShellNewEntry.cs
+++ b/src/Files.App/Data/Items/ShellNewEntry.cs
@@ -5,16 +5,16 @@ namespace Files.App.Data.Items
 {
 	public sealed class ShellNewEntry
 	{
-		public string Extension { get; set; }
+		public string? Extension { get; set; }
 
-		public string Name { get; set; }
+		public string? Name { get; set; }
 
-		public string Command { get; set; }
+		public string? Command { get; set; }
 
-		public string IconBase64 { get; set; }
+		public string? IconBase64 { get; set; }
 
-		public byte[] Data { get; set; }
+		public byte[]? Data { get; set; }
 
-		public string Template { get; set; }
+		public string? Template { get; set; }
 	}
 }
diff --git a/src/Files.App/Data/Items/ShellOperationResult.cs b/src/Files.App/Data/Items/ShellOperationResult.cs
index 7c93baddd4cd..436254781879 100644
--- a/src/Files.App/Data/Items/ShellOperationResult.cs
+++ b/src/Files.App/Data/Items/ShellOperationResult.cs
@@ -27,7 +27,7 @@ public sealed class ShellOperationItemResult
 	{
 		public bool Succeeded { get; set; }
 		public int HResult { get; set; }
-		public string Source { get; set; }
-		public string Destination { get; set; }
+		public string? Source { get; set; }
+		public string? Destination { get; set; }
 	}
 }
diff --git a/src/Files.App/Data/Items/SidebarLibraryItem.cs b/src/Files.App/Data/Items/SidebarLibraryItem.cs
index c9ab535aef32..a890a635f02f 100644
--- a/src/Files.App/Data/Items/SidebarLibraryItem.cs
+++ b/src/Files.App/Data/Items/SidebarLibraryItem.cs
@@ -5,11 +5,11 @@ namespace Files.App.Data.Items
 {
 	public sealed partial class LibraryLocationItem : LocationItem
 	{
-		public string DefaultSaveFolder { get; }
+		public string? DefaultSaveFolder { get; }
 
 		public ReadOnlyCollection<string> Folders { get; }
 
-		public bool IsEmpty => DefaultSaveFolder is null || Folders is null || Folders.Count is 0;
+		public bool IsEmpty => string.IsNullOrEmpty(DefaultSaveFolder) || Folders.Count is 0;
 
 		public LibraryLocationItem(ShellLibraryItem shellLibrary)
 		{
@@ -21,24 +21,27 @@ public LibraryLocationItem(ShellLibraryItem shellLibrary)
 				ShowShellItems = true,
 				ShowUnpinItem = !shellLibrary.IsPinned,
 			};
-			Text = shellLibrary.DisplayName is not null ? shellLibrary.DisplayName : "";
-			Path = shellLibrary.FullPath;
+			Text = shellLibrary.DisplayName
+				?? throw new InvalidOperationException("The library does not have a display name.");
+			Path = shellLibrary.FullPath
+				?? throw new InvalidOperationException("The library does not have a path.");
 			DefaultSaveFolder = shellLibrary.DefaultSaveFolder;
-			Folders = shellLibrary.Folders is null ? null : new ReadOnlyCollection<string>(shellLibrary.Folders);
+			Folders = new ReadOnlyCollection<string>(shellLibrary.Folders ?? []);
 			IsDefaultLocation = shellLibrary.IsPinned;
 		}
 
 		public async Task<bool> CheckDefaultSaveFolderAccess()
 		{
-			if (IsEmpty)
+			var defaultSaveFolder = DefaultSaveFolder;
+			if (string.IsNullOrEmpty(defaultSaveFolder) || Folders.Count is 0)
 				return false;
 
-			var res = (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(DefaultSaveFolder);
+			var res = (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(defaultSaveFolder);
 
 			if (!res)
 			{
-				var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(DefaultSaveFolder));
-				res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(DefaultSaveFolder, item));
+				var item = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(defaultSaveFolder));
+				res = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(defaultSaveFolder, item));
 			}
 
 			return res;
@@ -46,8 +49,9 @@ public async Task<bool> CheckDefaultSaveFolderAccess()
 
 		public async Task LoadLibraryIconAsync()
 		{
+			var path = this.GetRequiredPath();
 			var result = await FileThumbnailHelper.GetIconAsync(
-				Path,
+				path,
 				Constants.ShellIconSizes.Small,
 				false,
 				IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);
@@ -57,7 +61,8 @@ public async Task LoadLibraryIconAsync()
 				Icon = bitmapImage;
 		}
 
-		public override int GetHashCode() => Path.GetHashCode(System.StringComparison.OrdinalIgnoreCase);
+		public override int GetHashCode()
+			=> this.GetRequiredPath().GetHashCode(System.StringComparison.OrdinalIgnoreCase);
 
 		public override bool Equals(object? obj)
 			=> obj is LibraryLocationItem other && GetType() == obj.GetType() && string.Equals(Path, other.Path, System.StringComparison.OrdinalIgnoreCase);
diff --git a/src/Files.App/Data/Items/WidgetContainerItem.cs b/src/Files.App/Data/Items/WidgetContainerItem.cs
index 8184c5f2300b..18d6c0b4c072 100644
--- a/src/Files.App/Data/Items/WidgetContainerItem.cs
+++ b/src/Files.App/Data/Items/WidgetContainerItem.cs
@@ -30,7 +30,7 @@ public string WidgetAutomationProperties
 		public bool ShowMenuFlyout
 			=> WidgetItemModel.ShowMenuFlyout;
 
-		public MenuFlyoutItem MenuFlyoutItem
+		public MenuFlyoutItem? MenuFlyoutItem
 			=> WidgetItemModel.MenuFlyoutItem;
 
 		private object _WidgetControl;
@@ -57,8 +57,8 @@ public WidgetContainerItem(object widgetControl, IWidgetViewModel widgetItemMode
 			_expanderValueChangedCallback = expanderValueChangedCallback;
 			_expanderValueRequestedCallback = expanderValueRequestedCallback;
 
-			WidgetItemModel = widgetItemModel;
-			WidgetControl = widgetControl;
+			_WidgetItemModel = widgetItemModel;
+			_WidgetControl = widgetControl;
 		}
 
 		// Disposer
diff --git a/src/Files.App/Data/Items/WidgetDriveCardItem.cs b/src/Files.App/Data/Items/WidgetDriveCardItem.cs
index c8d41ed31d4a..e1167acc9248 100644
--- a/src/Files.App/Data/Items/WidgetDriveCardItem.cs
+++ b/src/Files.App/Data/Items/WidgetDriveCardItem.cs
@@ -7,12 +7,10 @@ namespace Files.App.Data.Items
 {
 	public sealed partial class WidgetDriveCardItem : WidgetCardItem, IWidgetCardItem<DriveItem>, IComparable<WidgetDriveCardItem>
 	{
-		private byte[] thumbnailData;
-
 		public new DriveItem Item { get; private set; }
 
-		private BitmapImage thumbnail;
-		public BitmapImage Thumbnail
+		private BitmapImage? thumbnail;
+		public BitmapImage? Thumbnail
 		{
 			get => thumbnail;
 			set => SetProperty(ref thumbnail, value);
@@ -34,18 +32,16 @@ public async Task LoadCardThumbnailAsync()
 
 			if (result is null)
 			{
-				using var thumbnail = await DriveHelpers.GetThumbnailAsync(Item.Root);
+				using var thumbnail = await DriveHelpers.GetThumbnailAsync(Item.Root!);
 				result ??= await thumbnail.ToByteArrayAsync();
 			}
 
-			thumbnailData = result;
-
-			var bitmapImage = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => thumbnailData.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
+			var bitmapImage = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => result.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
 			if (bitmapImage is not null)
 				Thumbnail = bitmapImage;
 		}
 
 		public int CompareTo(WidgetDriveCardItem? other)
-			=> Item.Path.CompareTo(other?.Item?.Path);
+			=> Item.Path!.CompareTo(other?.Item?.Path);
 	}
 }
diff --git a/src/Files.App/Data/Items/WidgetFileTagCardItem.cs b/src/Files.App/Data/Items/WidgetFileTagCardItem.cs
index b18d137ab66e..05d15f7f2f70 100644
--- a/src/Files.App/Data/Items/WidgetFileTagCardItem.cs
+++ b/src/Files.App/Data/Items/WidgetFileTagCardItem.cs
@@ -35,8 +35,8 @@ public string? Name
 			set => SetProperty(ref _Name, value);
 		}
 
-		private string _Path;
-		public override string Path
+		private string? _Path;
+		public override string? Path
 		{
 			get => _Path;
 			set => SetProperty(ref _Path, value);
diff --git a/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs b/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs
index 75d8e0b7d095..9846390c5eb6 100644
--- a/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs
+++ b/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs
@@ -114,7 +114,7 @@ private Task<bool> ViewMore()
 
 		private Task OpenAll()
 		{
-			SelectedTagChanged?.Invoke(this, new(Tags.Select(tag => (tag.Path, tag.IsFolder))));
+			SelectedTagChanged?.Invoke(this, new(Tags.Select(tag => (tag.Path!, tag.IsFolder))));
 
 			return Commands.OpenAllTagged.ExecuteAsync();
 		}
diff --git a/src/Files.App/Data/Items/Win32Process.cs b/src/Files.App/Data/Items/Win32Process.cs
index 1f26f03e2bc1..f79226e911b3 100644
--- a/src/Files.App/Data/Items/Win32Process.cs
+++ b/src/Files.App/Data/Items/Win32Process.cs
@@ -5,12 +5,12 @@ namespace Files.App.Data.Items
 {
 	public sealed class Win32Process
 	{
-		public string Name { get; set; }
+		public string? Name { get; set; }
 
 		public int Pid { get; set; }
 
-		public string FileName { get; set; }
+		public string? FileName { get; set; }
 
-		public string AppName { get; set; }
+		public string? AppName { get; set; }
 	}
 }
diff --git a/src/Files.App/Data/Items/WslDistroItem.cs b/src/Files.App/Data/Items/WslDistroItem.cs
index ef3603fbaedc..281a665e52ce 100644
--- a/src/Files.App/Data/Items/WslDistroItem.cs
+++ b/src/Files.App/Data/Items/WslDistroItem.cs
@@ -1,30 +1,34 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Files.App.Controls;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
 namespace Files.App.Data.Items
 {
 	public sealed partial class WslDistroItem : ObservableObject, INavigationControlItem
 	{
-		public string Text { get; set; }
+		public string? Text { get; set; }
 
-		private string path;
-		public string Path
+		private string? path;
+		public string? Path
 		{
 			get => path;
 			set
 			{
 				path = value;
-				ToolTip = Path.Contains('?', StringComparison.Ordinal) ? Text : Path;
+				ArgumentNullException.ThrowIfNull(value);
+				var currentPath = value;
+				ToolTip = currentPath.Contains('?', StringComparison.Ordinal) ? Text : currentPath;
 			}
 		}
 
 		public NavigationControlItemType ItemType
 			=> NavigationControlItemType.LinuxDistro;
 
-		private Uri icon;
-		public Uri Icon
+		private Uri? icon;
+		public Uri? Icon
 		{
 			get => icon;
 			set
@@ -36,12 +40,12 @@ public Uri Icon
 
 		public SectionType Section { get; set; }
 
-		public ContextMenuOptions MenuOptions { get; set; }
+		public ContextMenuOptions? MenuOptions { get; set; }
 
 		public object? Children => null;
 
-		private object toolTip = "";
-		public object ToolTip
+		private object? toolTip = "";
+		public object? ToolTip
 		{
 			get => toolTip;
 			set
@@ -65,6 +69,16 @@ public IconElement? IconElement
 			}
 		}
 
-		public int CompareTo(INavigationControlItem? other) => Text.CompareTo(other.Text);
+		FrameworkElement? ISidebarItemPresentationModel.IconElement => IconElement;
+		FrameworkElement? ISidebarItemPresentationModel.ItemDecorator => null;
+
+		public int CompareTo(INavigationControlItem? other)
+		{
+			var text = Text ?? throw new InvalidOperationException("The distribution name has not been initialized.");
+			var otherText = other?.Text
+				?? throw new ArgumentException("The compared item must have a name.", nameof(other));
+
+			return text.CompareTo(otherText);
+		}
 	}
 }
diff --git a/src/Files.App/Data/Models/AppModel.cs b/src/Files.App/Data/Models/AppModel.cs
index 8de93514362e..3535ae454687 100644
--- a/src/Files.App/Data/Models/AppModel.cs
+++ b/src/Files.App/Data/Models/AppModel.cs
@@ -17,7 +17,7 @@ public AppModel()
 		}
 
 		// TODO: Refactor this method
-		public void Clipboard_ContentChanged(object sender, object e)
+		public void Clipboard_ContentChanged(object? sender, object e)
 		{
 			try
 			{
diff --git a/src/Files.App/Data/Models/BitmapImageModel.cs b/src/Files.App/Data/Models/BitmapImageModel.cs
index 791920ddae42..e14acf48ef6e 100644
--- a/src/Files.App/Data/Models/BitmapImageModel.cs
+++ b/src/Files.App/Data/Models/BitmapImageModel.cs
@@ -9,9 +9,9 @@ namespace Files.App.Data.Models
 	/// <inheritdoc cref="IImage"/>
 	internal sealed class BitmapImageModel : IImage
 	{
-		public BitmapImage Image { get; }
+		public BitmapImage? Image { get; }
 
-		public BitmapImageModel(BitmapImage image)
+		public BitmapImageModel(BitmapImage? image)
 		{
 			Image = image;
 		}
diff --git a/src/Files.App/Data/Models/CompressArchiveModel.cs b/src/Files.App/Data/Models/CompressArchiveModel.cs
index 07ace9724c8b..faf02f992a82 100644
--- a/src/Files.App/Data/Models/CompressArchiveModel.cs
+++ b/src/Files.App/Data/Models/CompressArchiveModel.cs
@@ -13,9 +13,9 @@ namespace Files.App.Data.Models
 	/// </summary>
 	public sealed class CompressArchiveModel : ICompressArchiveModel
 	{
-		private StatusCenterItemProgressModel _fileSystemProgress;
+		private StatusCenterItemProgressModel? _fileSystemProgress;
 
-		private FileSizeCalculator _sizeCalculator;
+		private FileSizeCalculator? _sizeCalculator;
 
 		private string ArchiveExtension => FileFormat switch
 		{
@@ -63,16 +63,15 @@ public sealed class CompressArchiveModel : ICompressArchiveModel
 			_ => throw new ArgumentOutOfRangeException(nameof(SplittingSize)),
 		};
 
-		private IProgress<StatusCenterItemProgressModel> _Progress;
-		public IProgress<StatusCenterItemProgressModel> Progress
+		private IProgress<StatusCenterItemProgressModel>? _Progress;
+		public IProgress<StatusCenterItemProgressModel>? Progress
 		{
 			get => _Progress;
 			set
 			{
 				_Progress = value;
-
 				_fileSystemProgress = new(
-					Progress,
+					value,
 					false,
 					FileSystemStatusCode.InProgress);
 
@@ -155,6 +154,9 @@ public string GetArchivePath(string suffix = "")
 		/// <inheritdoc/>
 		public async Task<bool> RunCreationAsync()
 		{
+			if (_fileSystemProgress is null)
+				throw new InvalidOperationException("Compression progress must be initialized before archive creation starts.");
+
 			string[] sources = Sources.ToArray();
 
 			var compressor = new SevenZipCompressor()
@@ -289,7 +291,7 @@ static void AddEntry(IDictionary<string, string> fileDictionary, string director
 
 							if (directories.Length == 0)
 							{
-								fileDictionary.Add(entryPrefix + directoryInfo.Name, null);
+								AddArchiveEntry(fileDictionary, entryPrefix + directoryInfo.Name, null);
 							}
 							else
 							{
@@ -298,6 +300,10 @@ static void AddEntry(IDictionary<string, string> fileDictionary, string director
 									AddEntry(fileDictionary, directoryInfo2.FullName, entryPrefix);
 							}
 						}
+
+						// SevenZipSharp uses a null source path to represent an empty directory.
+						static void AddArchiveEntry(IDictionary<string, string> entries, string name, string? sourcePath)
+							=> entries.Add(name, sourcePath!);
 					}
 
 					compressor.CompressionMode = CompressionMode.Append;
@@ -399,20 +405,20 @@ private void Compressor_FileCompressionStarted(object? sender, FileNameEventArgs
 				return;
 			}
 
-			_sizeCalculator.ForceComputeFileSize(e.FilePath);
-			_fileSystemProgress.FileName = e.FileName;
+			_sizeCalculator!.ForceComputeFileSize(e.FilePath);
+			_fileSystemProgress!.FileName = e.FileName;
 			_fileSystemProgress.Report();
 		}
 
 		private void Compressor_FileCompressionFinished(object? sender, EventArgs e)
 		{
-			_fileSystemProgress.AddProcessedItemsCount(1);
+			_fileSystemProgress!.AddProcessedItemsCount(1);
 			_fileSystemProgress.Report();
 		}
 
 		private void Compressor_Compressing(object? _, ProgressEventArgs e)
 		{
-			if (_fileSystemProgress.TotalSize > 0)
+			if (_fileSystemProgress!.TotalSize > 0)
 				_fileSystemProgress.Report((_fileSystemProgress.ProcessedSize + e.PercentDelta / 100.0 * e.BytesCount) / _fileSystemProgress.TotalSize * 100);
 		}
 
diff --git a/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModel.cs b/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModel.cs
index c8884e2eedac..87d256ee36f8 100644
--- a/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModel.cs
+++ b/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModel.cs
@@ -11,27 +11,27 @@ public sealed class ContextMenuFlyoutItemViewModel
 	{
 		public bool ShowItem { get; set; } = true;
 
-		public ICommand Command { get; set; }
+		public ICommand? Command { get; set; }
 
-		public object CommandParameter { get; set; }
+		public object? CommandParameter { get; set; }
 
-		public string Glyph { get; set; }
+		public string? Glyph { get; set; }
 
-		public string GlyphFontFamilyName { get; set; }
+		public string? GlyphFontFamilyName { get; set; }
 
-		public string KeyboardAcceleratorTextOverride { get; set; }
+		public string? KeyboardAcceleratorTextOverride { get; set; }
 
-		public string Text { get; set; }
+		public string? Text { get; set; }
 
-		public object Tag { get; set; }
+		public object? Tag { get; set; }
 
 		public ContextMenuFlyoutItemType ItemType { get; set; }
 
-		public Func<Task> LoadSubMenuAction { get; set; }
+		public Func<Task>? LoadSubMenuAction { get; set; }
 
-		public List<ContextMenuFlyoutItemViewModel> Items { get; set; }
+		public List<ContextMenuFlyoutItemViewModel>? Items { get; set; }
 
-		public BitmapImage BitmapIcon { get; set; }
+		public BitmapImage? BitmapIcon { get; set; }
 
 		public bool ShowOnShift { get; set; }
 
@@ -45,13 +45,13 @@ public sealed class ContextMenuFlyoutItemViewModel
 
 		public bool ShowInZipPage { get; set; }
 
-		public KeyboardAccelerator KeyboardAccelerator { get; set; }
+		public KeyboardAccelerator? KeyboardAccelerator { get; set; }
 
 		public bool IsChecked { get; set; }
 
 		public bool IsEnabled { get; set; } = true;
 
-		public string ID { get; set; }
+		public string? ID { get; set; }
 
 		public bool IsPrimary { get; set; }
 
diff --git a/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModelBuilder.cs b/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModelBuilder.cs
index 16577012d18b..0a575f0689ed 100644
--- a/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModelBuilder.cs
+++ b/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModelBuilder.cs
@@ -28,7 +28,7 @@ public bool IsVisible
 
 		public string AccessKey { get; init; } = string.Empty;
 
-		public object Tag { get; init; }
+		public object? Tag { get; init; }
 
 		public bool ShowOnShift { get; init; } = false;
 
diff --git a/src/Files.App/Data/Models/CurrentInstanceViewModel.cs b/src/Files.App/Data/Models/CurrentInstanceViewModel.cs
index ffc6a977f291..9c154b967c7e 100644
--- a/src/Files.App/Data/Models/CurrentInstanceViewModel.cs
+++ b/src/Files.App/Data/Models/CurrentInstanceViewModel.cs
@@ -34,8 +34,8 @@ public bool IsPageTypeSearchResults
 			}
 		}
 
-		private string currentSearchQuery;
-		public string CurrentSearchQuery
+		private string? currentSearchQuery;
+		public string? CurrentSearchQuery
 		{
 			get => currentSearchQuery;
 			set => SetProperty(ref currentSearchQuery, value);
diff --git a/src/Files.App/Data/Models/HashInfoItem.cs b/src/Files.App/Data/Models/HashInfoItem.cs
index 6a266be32697..0c73b76c2cca 100644
--- a/src/Files.App/Data/Models/HashInfoItem.cs
+++ b/src/Files.App/Data/Models/HashInfoItem.cs
@@ -5,15 +5,15 @@ namespace Files.App.Data.Models
 {
 	public sealed partial class HashInfoItem : ObservableObject
 	{
-		private string _Algorithm;
+		private string? _Algorithm;
 		public string Algorithm
 		{
-			get => _Algorithm;
+			get => _Algorithm ?? throw new InvalidOperationException("The hash algorithm has not been initialized.");
 			set => SetProperty(ref _Algorithm, value);
 		}
 
-		private string _HashValue;
-		public string HashValue
+		private string? _HashValue;
+		public string? HashValue
 		{
 			get => _HashValue;
 			set => SetProperty(ref _HashValue, value);
diff --git a/src/Files.App/Data/Models/ItemManipulationModel.cs b/src/Files.App/Data/Models/ItemManipulationModel.cs
index 670376a761ba..70293fdaa066 100644
--- a/src/Files.App/Data/Models/ItemManipulationModel.cs
+++ b/src/Files.App/Data/Models/ItemManipulationModel.cs
@@ -5,33 +5,33 @@ namespace Files.App.Data.Models
 {
 	public sealed class ItemManipulationModel
 	{
-		public event EventHandler FocusFileListInvoked;
+		public event EventHandler? FocusFileListInvoked;
 
-		public event EventHandler SelectAllItemsInvoked;
+		public event EventHandler? SelectAllItemsInvoked;
 
-		public event EventHandler ClearSelectionInvoked;
+		public event EventHandler? ClearSelectionInvoked;
 
-		public event EventHandler InvertSelectionInvoked;
+		public event EventHandler? InvertSelectionInvoked;
 
-		public event EventHandler<ListedItem> AddSelectedItemInvoked;
+		public event EventHandler<ListedItem>? AddSelectedItemInvoked;
 
-		public event EventHandler<ListedItem> RemoveSelectedItemInvoked;
+		public event EventHandler<ListedItem>? RemoveSelectedItemInvoked;
 
-		public event EventHandler FocusSelectedItemsInvoked;
+		public event EventHandler? FocusSelectedItemsInvoked;
 
-		public event EventHandler StartRenameItemInvoked;
+		public event EventHandler? StartRenameItemInvoked;
 
-		public event EventHandler<ListedItem> ScrollIntoViewInvoked;
+		public event EventHandler<ListedItem>? ScrollIntoViewInvoked;
 
-		public event EventHandler ScrollToTopInvoked;
+		public event EventHandler? ScrollToTopInvoked;
 
-		public event EventHandler SetDragModeForItemsInvoked;
+		public event EventHandler? SetDragModeForItemsInvoked;
 
-		public event EventHandler RefreshItemsOpacityInvoked;
+		public event EventHandler? RefreshItemsOpacityInvoked;
 
-		public event EventHandler RefreshItemThumbnailInvoked;
+		public event EventHandler? RefreshItemThumbnailInvoked;
 
-		public event EventHandler RefreshItemsThumbnailInvoked;
+		public event EventHandler? RefreshItemsThumbnailInvoked;
 
 		public void FocusFileList()
 		{
diff --git a/src/Files.App/Data/Models/ListedTagViewModel.cs b/src/Files.App/Data/Models/ListedTagViewModel.cs
index e8390610c8df..705dc535d524 100644
--- a/src/Files.App/Data/Models/ListedTagViewModel.cs
+++ b/src/Files.App/Data/Models/ListedTagViewModel.cs
@@ -33,8 +33,8 @@ public bool CanCommit
 			set => SetProperty(ref _CanCommit, value);
 		}
 
-		private string _NewName;
-		public string NewName
+		private string? _NewName;
+		public string? NewName
 		{
 			get => _NewName;
 			set => SetProperty(ref _NewName, value);
@@ -49,8 +49,8 @@ public string NewColor
 
 		public ListedTagViewModel(TagViewModel tag)
 		{
-			Tag = tag;
-			NewColor = tag.Color;
+			_Tag = tag;
+			_NewColor = tag.Color;
 		}
 	}
 }
diff --git a/src/Files.App/Data/Models/PinnedFoldersManager.cs b/src/Files.App/Data/Models/PinnedFoldersManager.cs
index 58d8576a0038..27762d44561f 100644
--- a/src/Files.App/Data/Models/PinnedFoldersManager.cs
+++ b/src/Files.App/Data/Models/PinnedFoldersManager.cs
@@ -43,7 +43,7 @@ public async Task UpdateItemsWithExplorerAsync()
 
 				PinnedFolders = (await QuickAccessService.GetPinnedFoldersAsync())
 					.Where(link => (bool?)link.Properties["System.Home.IsPinned"] ?? false)
-					.Select(link => link.FilePath).ToList();
+					.Select(link => link.FilePath!).ToList();
 
 				if (formerPinnedFolders.SequenceEqual(PinnedFolders))
 					return;
@@ -75,8 +75,8 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 			var isLibrary = LibraryManager.IsLibraryPath(path);
 			var libraryDisplayName = isLibrary ? GetLibraryDisplayName(path) : null;
 
-			var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(path));
-			var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, item));
+			var item = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(path));
+			var res = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, item));
 			LocationItem locationItem;
 
 			if (string.Equals(path, Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
@@ -114,8 +114,8 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 			else if (res)
 			{
 				locationItem.IsInvalid = false;
-				if (res.Result is not null)
-					await LoadIconForLocationItemAsync(locationItem, res.Result.Path);
+				if (res!.Result is { } folder)
+					await LoadIconForLocationItemAsync(locationItem, folder.Path);
 			}
 			else
 			{
@@ -127,7 +127,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 			return locationItem;
 		}
 
-		private static string GetLibraryDisplayName(string libraryPath)
+		private static string? GetLibraryDisplayName(string libraryPath)
 		{
 			using var storable = WindowsStorable.TryParse(libraryPath);
 			if (storable is null)
@@ -222,7 +222,7 @@ public void RemoveStaleSidebarItems()
 			// Remove unpinned items from PinnedFolderItems
 			foreach (var childItem in PinnedFolderItems)
 			{
-				if (childItem is LocationItem item && !item.IsDefaultLocation && !PinnedFolders.Contains(item.Path))
+				if (childItem is LocationItem item && !item.IsDefaultLocation && !Enumerable.Contains<string?>(PinnedFolders, item.Path))
 				{
 					lock (_PinnedFolderItems)
 					{
diff --git a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs
index d0d2828286a2..ce4cece3161c 100644
--- a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs
+++ b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs
@@ -34,8 +34,8 @@ public bool LoadCombinedItemsGlyph
 			set => SetProperty(ref loadCombinedItemsGlyph, value);
 		}
 
-		private Uri customIconSource;
-		public Uri CustomIconSource
+		private Uri? customIconSource;
+		public Uri? CustomIconSource
 		{
 			get => customIconSource;
 			set => SetProperty(ref customIconSource, value);
@@ -55,15 +55,15 @@ public bool LoadFileIcon
 			set => SetProperty(ref loadFileIcon, value);
 		}
 
-		private byte[] iconData;
-		public byte[] IconData
+		private byte[]? iconData;
+		public byte[]? IconData
 		{
 			get => iconData;
 			set => SetProperty(ref iconData, value);
 		}
 
-		private string itemName;
-		public string ItemName
+		private string? itemName;
+		public string? ItemName
 		{
 			get => itemName;
 			set
@@ -73,8 +73,8 @@ public string ItemName
 			}
 		}
 
-		private string originalItemName;
-		public string OriginalItemName
+		private string? originalItemName;
+		public string? OriginalItemName
 		{
 			get => originalItemName;
 			set
@@ -91,8 +91,8 @@ public bool ItemNameVisibility
 			set => SetProperty(ref itemNameVisibility, value);
 		}
 
-		private string itemType;
-		public string ItemType
+		private string? itemType;
+		public string? ItemType
 		{
 			get => itemType;
 			set
@@ -109,8 +109,8 @@ public bool ItemTypeVisibility
 			set => SetProperty(ref itemTypeVisibility, value);
 		}
 
-		private string driveFileSystem;
-		public string DriveFileSystem
+		private string? driveFileSystem;
+		public string? DriveFileSystem
 		{
 			get => driveFileSystem;
 			set
@@ -127,8 +127,8 @@ public bool DriveFileSystemVisibility
 			set => SetProperty(ref driveFileSystemVisibility, value);
 		}
 
-		private string itemLocation;
-		public string ItemLocation
+		private string? itemLocation;
+		public string? ItemLocation
 		{
 			get => itemLocation;
 			set
@@ -145,22 +145,22 @@ public bool ItemLocationVisibility
 			set => SetProperty(ref itemLocationVisibility, value);
 		}
 
-		private string itemSize;
-		public string ItemSize
+		private string? itemSize;
+		public string? ItemSize
 		{
 			get => itemSize;
 			set => SetProperty(ref itemSize, value);
 		}
 
-		private string itemSizeOnDisk;
-		public string ItemSizeOnDisk
+		private string? itemSizeOnDisk;
+		public string? ItemSizeOnDisk
 		{
 			get => itemSizeOnDisk;
 			set => SetProperty(ref itemSizeOnDisk, value);
 		}
 
-		private string uncompresseditemSize;
-		public string UncompressedItemSize
+		private string? uncompresseditemSize;
+		public string? UncompressedItemSize
 		{
 			get => uncompresseditemSize;
 			set
@@ -241,8 +241,8 @@ public int FilesCount
 			set => SetProperty(ref filesCount, value);
 		}
 
-		public string filesAndFoldersCountString;
-		public string FilesAndFoldersCountString
+		public string? filesAndFoldersCountString;
+		public string? FilesAndFoldersCountString
 		{
 			get => filesAndFoldersCountString;
 			set
@@ -274,8 +274,8 @@ public ulong DriveUsedSpaceValue
 			}
 		}
 
-		private string driveUsedSpace;
-		public string DriveUsedSpace
+		private string? driveUsedSpace;
+		public string? DriveUsedSpace
 		{
 			get => driveUsedSpace;
 			set
@@ -285,8 +285,8 @@ public string DriveUsedSpace
 			}
 		}
 
-		private string driveUsedSpaceLongSize;
-		public string DriveUsedSpaceLongSize
+		private string? driveUsedSpaceLongSize;
+		public string? DriveUsedSpaceLongSize
 		{
 			get => driveUsedSpaceLongSize;
 			set
@@ -315,8 +315,8 @@ public ulong DriveFreeSpaceValue
 			}
 		}
 
-		private string driveFreeSpace;
-		public string DriveFreeSpace
+		private string? driveFreeSpace;
+		public string? DriveFreeSpace
 		{
 			get => driveFreeSpace;
 			set
@@ -326,8 +326,8 @@ public string DriveFreeSpace
 			}
 		}
 
-		private string driveFreeSpaceLongSize;
-		public string DriveFreeSpaceLongSize
+		private string? driveFreeSpaceLongSize;
+		public string? DriveFreeSpaceLongSize
 		{
 			get => driveFreeSpaceLongSize;
 			set
@@ -343,7 +343,7 @@ public bool DriveFreeSpaceVisibility
 			set => SetProperty(ref driveFreeSpaceVisibility, value);
 		}
 
-		public string ItemCreatedTimestamp { get; private set; }
+		public string? ItemCreatedTimestamp { get; private set; }
 
 		private DateTimeOffset itemCreatedTimestampReal;
 		public DateTimeOffset ItemCreatedTimestampReal
@@ -365,7 +365,7 @@ public bool ItemCreatedTimestampVisibility
 			set => SetProperty(ref itemCreatedTimestampVisibility, value);
 		}
 
-		public string ItemModifiedTimestamp { get; private set; }
+		public string? ItemModifiedTimestamp { get; private set; }
 
 		private DateTimeOffset itemModifiedTimestampReal;
 		public DateTimeOffset ItemModifiedTimestampReal
@@ -387,7 +387,7 @@ public bool ItemModifiedTimestampVisibility
 			set => SetProperty(ref itemModifiedTimestampVisibility, value);
 		}
 
-		public string ItemAccessedTimestamp { get; private set; }
+		public string? ItemAccessedTimestamp { get; private set; }
 
 		public DateTimeOffset itemAccessedTimestampReal;
 		public DateTimeOffset ItemAccessedTimestampReal
@@ -429,8 +429,8 @@ public ulong DriveCapacityValue
 			}
 		}
 
-		private string driveCapacity;
-		public string DriveCapacity
+		private string? driveCapacity;
+		public string? DriveCapacity
 		{
 			get => driveCapacity;
 			set
@@ -440,8 +440,8 @@ public string DriveCapacity
 			}
 		}
 
-		private string driveCapacityLongSize;
-		public string DriveCapacityLongSize
+		private string? driveCapacityLongSize;
+		public string? DriveCapacityLongSize
 		{
 			get => driveCapacityLongSize;
 			set
@@ -469,8 +469,8 @@ public bool CleanupVisibility
 			set => SetProperty(ref cleanupVisibility, value);
 		}
 
-		private ICommand cleanupDriveCommand;
-		public ICommand CleanupDriveCommand
+		private ICommand? cleanupDriveCommand;
+		public ICommand? CleanupDriveCommand
 		{
 			get => cleanupDriveCommand;
 			set => SetProperty(ref cleanupDriveCommand, value);
@@ -483,22 +483,22 @@ public bool FormatVisibility
 			set => SetProperty(ref formatVisibility, value);
 		}
 
-		private ICommand formatDriveCommand;
-		public ICommand FormatDriveCommand
+		private ICommand? formatDriveCommand;
+		public ICommand? FormatDriveCommand
 		{
 			get => formatDriveCommand;
 			set => SetProperty(ref formatDriveCommand, value);
 		}
 
-		private ICommand editAlbumCoverCommand;
-		public ICommand EditAlbumCoverCommand
+		private ICommand? editAlbumCoverCommand;
+		public ICommand? EditAlbumCoverCommand
 		{
 			get => editAlbumCoverCommand;
 			set => SetProperty(ref editAlbumCoverCommand, value);
 		}
 
-		private ICommand removeAlbumCoverCommand;
-		public ICommand RemoveAlbumCoverCommand
+		private ICommand? removeAlbumCoverCommand;
+		public ICommand? RemoveAlbumCoverCommand
 		{
 			get => removeAlbumCoverCommand;
 			set => SetProperty(ref removeAlbumCoverCommand, value);
@@ -511,8 +511,8 @@ public bool ItemAttributesVisibility
 			set => SetProperty(ref itemAttributesVisibility, value);
 		}
 
-		private string selectedItemsCountString;
-		public string SelectedItemsCountString
+		private string? selectedItemsCountString;
+		public string? SelectedItemsCountString
 		{
 			get => selectedItemsCountString;
 			set => SetProperty(ref selectedItemsCountString, value);
@@ -550,7 +550,7 @@ public bool IsSelectedItemShortcut
 			set => SetProperty(ref isSelectedItemShortcut, value);
 		}
 
-		public void CheckAllFileExtensions(List<string> itemExtensions)
+		public void CheckAllFileExtensions(List<string?> itemExtensions)
 		{
 			// Checks if all the item extensions are image extensions of some kind.
 			IsCompatibleToSetAsWindowsWallpaper = itemExtensions.TrueForAll(FileExtensionHelpers.IsCompatibleToSetAsWindowsWallpaper);
@@ -558,15 +558,15 @@ public void CheckAllFileExtensions(List<string> itemExtensions)
 			IsSelectedItemShortcut = (itemExtensions.Count == 1) && (itemExtensions.TrueForAll(itemExtension => FileExtensionHelpers.IsShortcutFile(itemExtension)));
 		}
 
-		private string shortcutItemType;
-		public string ShortcutItemType
+		private string? shortcutItemType;
+		public string? ShortcutItemType
 		{
 			get => shortcutItemType;
 			set => SetProperty(ref shortcutItemType, value);
 		}
 
-		private string shortcutItemPath;
-		public string ShortcutItemPath
+		private string? shortcutItemPath;
+		public string? ShortcutItemPath
 		{
 			get => shortcutItemPath;
 			set
@@ -576,8 +576,8 @@ public string ShortcutItemPath
 			}
 		}
 
-		private string shortcutItemPathEditedValue;
-		public string ShortcutItemPathEditedValue
+		private string? shortcutItemPathEditedValue;
+		public string? ShortcutItemPathEditedValue
 		{
 			get => shortcutItemPathEditedValue;
 			set => SetProperty(ref shortcutItemPathEditedValue, value);
@@ -590,8 +590,8 @@ public bool IsShortcutItemPathReadOnly
 			set => SetProperty(ref isShortcutItemPathReadOnly, value);
 		}
 
-		private string shortcutItemWorkingDir;
-		public string ShortcutItemWorkingDir
+		private string? shortcutItemWorkingDir;
+		public string? ShortcutItemWorkingDir
 		{
 			get => shortcutItemWorkingDir;
 			set
@@ -601,8 +601,8 @@ public string ShortcutItemWorkingDir
 			}
 		}
 
-		private string shortcutItemWorkingDirEditedValue;
-		public string ShortcutItemWorkingDirEditedValue
+		private string? shortcutItemWorkingDirEditedValue;
+		public string? ShortcutItemWorkingDirEditedValue
 		{
 			get => shortcutItemWorkingDirEditedValue;
 			set => SetProperty(ref shortcutItemWorkingDirEditedValue, value);
@@ -615,8 +615,8 @@ public bool ShortcutItemWorkingDirVisibility
 			set => SetProperty(ref shortcutItemWorkingDirVisibility, value);
 		}
 
-		private string shortcutItemArguments;
-		public string ShortcutItemArguments
+		private string? shortcutItemArguments;
+		public string? ShortcutItemArguments
 		{
 			get => shortcutItemArguments;
 			set
@@ -626,8 +626,8 @@ public string ShortcutItemArguments
 			}
 		}
 
-		private string shortcutItemArgumentsEditedValue;
-		public string ShortcutItemArgumentsEditedValue
+		private string? shortcutItemArgumentsEditedValue;
+		public string? ShortcutItemArgumentsEditedValue
 		{
 			get => shortcutItemArgumentsEditedValue;
 			set
@@ -650,8 +650,8 @@ public bool ShortcutItemWindowArgsVisibility
 			set => SetProperty(ref shortcutItemWindowArgsVisibility, value);
 		}
 
-		private RelayCommand shortcutItemOpenLinkCommand;
-		public RelayCommand ShortcutItemOpenLinkCommand
+		private RelayCommand? shortcutItemOpenLinkCommand;
+		public RelayCommand? ShortcutItemOpenLinkCommand
 		{
 			get => shortcutItemOpenLinkCommand;
 			set
@@ -812,9 +812,9 @@ public bool RunAsAdminEnabled
 		/// The localized string of the currently selected ShowWindowCommand.
 		/// This value can be used for display in the UI.
 		/// </summary>
-		public string SelectedShowWindowCommand
+		public string? SelectedShowWindowCommand
 		{
-			get => ShowWindowCommandTypes.GetValueOrDefault(ShowWindowCommandEditedValue)!;
+			get => ShowWindowCommandTypes.GetValueOrDefault(ShowWindowCommandEditedValue);
 			set => ShowWindowCommandEditedValue = ShowWindowCommandTypes.First(e => e.Value == value).Key;
 		}
 
@@ -881,8 +881,8 @@ public bool IsEditAlbumCoverVisible
 			set => SetProperty(ref isEditAlbumCoverVisible, value);
 		}
 
-		private Picture modifiedAlbumCover;
-		public Picture ModifiedAlbumCover
+		private Picture? modifiedAlbumCover;
+		public Picture? ModifiedAlbumCover
 		{
 			get => modifiedAlbumCover;
 			set => SetProperty(ref modifiedAlbumCover, value);
diff --git a/src/Files.App/Data/Models/SuggestionModel.cs b/src/Files.App/Data/Models/SuggestionModel.cs
index 8536839ece6f..f2133da528ce 100644
--- a/src/Files.App/Data/Models/SuggestionModel.cs
+++ b/src/Files.App/Data/Models/SuggestionModel.cs
@@ -56,7 +56,7 @@ public BitmapImage? FileImage
 			}
 		}
 
-		private void Img_ImageOpened(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+		private void Img_ImageOpened(object sender, Microsoft.UI.Xaml.RoutedEventArgs? e)
 		{
 			if (sender is BitmapImage image)
 			{
@@ -79,7 +79,7 @@ public SuggestionModel(ListedItem item)
 			LoadFileIcon = item.LoadFileIcon;
 			NeedsPlaceholderGlyph = item.NeedsPlaceholderGlyph;
 			ItemPath = item.ItemPath;
-			Name = item.Name;
+			Name = item.Name!;
 			FileImage = item.FileImage;
 		}
 
diff --git a/src/Files.App/Data/Parameters/ColumnParam.cs b/src/Files.App/Data/Parameters/ColumnParam.cs
index 2ce6e0e8f55d..03feba5b307b 100644
--- a/src/Files.App/Data/Parameters/ColumnParam.cs
+++ b/src/Files.App/Data/Parameters/ColumnParam.cs
@@ -9,7 +9,7 @@ public sealed class ColumnParam : NavigationArguments
 	{
 		public int Column { get; set; }
 
-		public ListView ListView { get; set; }
+		public ListView? ListView { get; set; }
 
 		public ColumnLayoutPage? Source { get; set; }
 	}
diff --git a/src/Files.App/Data/Parameters/PropertiesPageNavigationParameter.cs b/src/Files.App/Data/Parameters/PropertiesPageNavigationParameter.cs
index aff7aa5b5fbc..c81a6fbd0302 100644
--- a/src/Files.App/Data/Parameters/PropertiesPageNavigationParameter.cs
+++ b/src/Files.App/Data/Parameters/PropertiesPageNavigationParameter.cs
@@ -7,12 +7,12 @@ namespace Files.App.Data.Parameters
 {
 	public sealed class PropertiesPageNavigationParameter
 	{
-		public CancellationTokenSource CancellationTokenSource;
+		public CancellationTokenSource? CancellationTokenSource;
 
-		public object Parameter;
+		public object? Parameter;
 
-		public IShellPage AppInstance;
+		public IShellPage? AppInstance;
 
-		public Window Window;
+		public Window? Window;
 	}
 }
diff --git a/src/Files.App/Data/Parameters/TabBarItemParameter.cs b/src/Files.App/Data/Parameters/TabBarItemParameter.cs
index d88ad099fd95..4c9628c83880 100644
--- a/src/Files.App/Data/Parameters/TabBarItemParameter.cs
+++ b/src/Files.App/Data/Parameters/TabBarItemParameter.cs
@@ -6,10 +6,15 @@ namespace Files.App.Data.Parameters
 	public sealed class TabBarItemParameter
 	{
 		private static readonly KnownTypesConverter _typesConverter = new();
+		private Type? _initialPageType;
 
-		public Type InitialPageType { get; set; }
+		public Type InitialPageType
+		{
+			get => _initialPageType ?? throw new InvalidOperationException("The initial page type has not been set.");
+			set => _initialPageType = value;
+		}
 
-		public object NavigationParameter { get; set; }
+		public object? NavigationParameter { get; set; }
 
 		public string Serialize()
 		{
@@ -18,21 +23,30 @@ public string Serialize()
 
 		public static TabBarItemParameter Deserialize(string obj)
 		{
-			var tabArgs = new TabBarItemParameter();
+			var tempArgs = JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(obj)
+				?? throw new JsonException("The tab data is empty.");
+			var typeName = tempArgs[nameof(InitialPageType)].GetString();
+			if (string.IsNullOrEmpty(typeName))
+				throw new JsonException("The initial page type is missing or invalid.");
 
-			var tempArgs = JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(obj);
-			tabArgs.InitialPageType = Type.GetType(tempArgs[nameof(InitialPageType)].GetString());
+			// Restore navigation data from tabs whose original page type no longer exists.
+			var initialPageType = Type.GetType(typeName) ?? typeof(Files.App.Views.ShellPanesPage);
 
+			object? navigationParameter;
 			try
 			{
-				tabArgs.NavigationParameter = JsonSerializer.Deserialize<PaneNavigationArguments>(tempArgs[nameof(NavigationParameter)].GetRawText());
+				navigationParameter = JsonSerializer.Deserialize<PaneNavigationArguments>(tempArgs[nameof(NavigationParameter)].GetRawText());
 			}
 			catch (JsonException)
 			{
-				tabArgs.NavigationParameter = tempArgs[nameof(NavigationParameter)].GetString();
+				navigationParameter = tempArgs[nameof(NavigationParameter)].GetString();
 			}
 
-			return tabArgs;
+			return new TabBarItemParameter
+			{
+				InitialPageType = initialPageType,
+				NavigationParameter = navigationParameter,
+			};
 		}
 	}
 }
diff --git a/src/Files.App/Dialogs/AddItemDialog.xaml.cs b/src/Files.App/Dialogs/AddItemDialog.xaml.cs
index a68da84fed86..3c3d1ae89f6d 100644
--- a/src/Files.App/Dialogs/AddItemDialog.xaml.cs
+++ b/src/Files.App/Dialogs/AddItemDialog.xaml.cs
@@ -31,7 +31,10 @@ public AddItemDialog()
 
 		private void ListView_ItemClick(object sender, ItemClickEventArgs e)
 		{
-			ViewModel.ResultType = (e.ClickedItem as AddItemDialogListItemViewModel).ItemResult;
+			if (e.ClickedItem is not AddItemDialogListItemViewModel { ItemResult: { } itemResult })
+				throw new InvalidOperationException("The selected entry does not describe an item type.");
+
+			ViewModel.ResultType = itemResult;
 
 			Hide();
 		}
@@ -39,7 +42,7 @@ private void ListView_ItemClick(object sender, ItemClickEventArgs e)
 		private async void AddItemDialog_Loaded(object sender, RoutedEventArgs e)
 		{
 			var itemTypes = addItemService.GetEntries();
-			await ViewModel.AddItemsToListAsync(itemTypes);
+			await ViewModel.AddItemsToListAsync(itemTypes!);
 
 			// Focus on the list view so users can use keyboard navigation
 			AddItemsListView.Focus(FocusState.Programmatic);
diff --git a/src/Files.App/Dialogs/DynamicDialog.xaml.cs b/src/Files.App/Dialogs/DynamicDialog.xaml.cs
index 2df3599ad2fa..f1fa1057d541 100644
--- a/src/Files.App/Dialogs/DynamicDialog.xaml.cs
+++ b/src/Files.App/Dialogs/DynamicDialog.xaml.cs
@@ -12,10 +12,7 @@ private FrameworkElement RootAppElement
 			=> (FrameworkElement)MainWindow.Instance.Content;
 
 		public DynamicDialogViewModel ViewModel
-		{
-			get => (DynamicDialogViewModel)DataContext;
-			private set => DataContext = value;
-		}
+			=> DataContext as DynamicDialogViewModel ?? throw new ObjectDisposedException(nameof(DynamicDialog));
 
 		public DynamicDialogResult DynamicResult
 		{
@@ -32,40 +29,45 @@ public DynamicDialog(DynamicDialogViewModel dynamicDialogViewModel)
 			InitializeComponent();
 
 			dynamicDialogViewModel.HideDialog = Hide;
-			ViewModel = dynamicDialogViewModel;
+			DataContext = dynamicDialogViewModel;
 		}
 
 		private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
 		{
-			ViewModel.PrimaryButtonCommand.Execute(args);
+			(ViewModel.PrimaryButtonCommand
+				?? throw new InvalidOperationException("The primary button command has not been initialized.")).Execute(args);
 		}
 
 		private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
 		{
-			ViewModel.SecondaryButtonCommand.Execute(args);
+			(ViewModel.SecondaryButtonCommand
+				?? throw new InvalidOperationException("The secondary button command has not been initialized.")).Execute(args);
 		}
 
 		private void ContentDialog_CloseButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
 		{
-			ViewModel.CloseButtonCommand.Execute(args);
+			(ViewModel.CloseButtonCommand
+				?? throw new InvalidOperationException("The close button command has not been initialized.")).Execute(args);
 		}
 
 		private void ContentDialog_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
 		{
-			ViewModel.KeyDownCommand.Execute(e);
+			(ViewModel.KeyDownCommand
+				?? throw new InvalidOperationException("The key-down command has not been initialized.")).Execute(e);
 		}
 
-		// Focus is moved by the dialog itself while opening, so handlers that focus the
-		// display content can only run reliably once the dialog has fully opened
+		// The dialog moves focus to its default button after Opened is raised, so handlers
+		// that focus the display content must be dispatched to run after that
 		private void ContentDialog_Opened(ContentDialog sender, ContentDialogOpenedEventArgs args)
 		{
-			ViewModel.DisplayControlOnLoadedCommand?.Execute(null);
+			DispatcherQueue.TryEnqueue(() =>
+				(DataContext as DynamicDialogViewModel)?.DisplayControlOnLoadedCommand?.Execute(null));
 		}
 
 		public void Dispose()
 		{
-			ViewModel?.Dispose();
-			ViewModel = null;
+			(DataContext as DynamicDialogViewModel)?.Dispose();
+			DataContext = null;
 		}
 	}
 }
diff --git a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs
index 36e78ab6f6fd..170346d0028e 100644
--- a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs
+++ b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs
@@ -172,14 +172,14 @@ private void StartRename(FileSystemDialogConflictItemViewModel conflictItem)
 
 		private void EndRename(FileSystemDialogConflictItemViewModel conflictItem)
 		{
-			conflictItem.CustomName = FilesystemHelpers.FilterRestrictedCharacters(conflictItem.CustomName);
+			conflictItem.CustomName = FilesystemHelpers.FilterRestrictedCharacters(conflictItem.CustomName!);
 
 			if (ViewModel.IsNameAvailableForItem(conflictItem, conflictItem.CustomName!))
 				conflictItem.IsTextBoxVisible = false;
 			else
 				ViewModel.PrimaryButtonEnabled = false;
 
-			if (conflictItem.CustomName.Equals(conflictItem.DisplayName))
+			if (conflictItem.CustomName!.Equals(conflictItem.DisplayName))
 			{
 				var savedName = conflictItem.DestinationDisplayName;
 				conflictItem.DestinationDisplayName = savedName;
diff --git a/src/Files.App/Extensions/ImageSourceExtensions.cs b/src/Files.App/Extensions/ImageSourceExtensions.cs
index 313e1d8dd0c1..504df8e5d59d 100644
--- a/src/Files.App/Extensions/ImageSourceExtensions.cs
+++ b/src/Files.App/Extensions/ImageSourceExtensions.cs
@@ -10,7 +10,7 @@ namespace Files.App.Extensions
 {
 	internal static class ImageSourceExtensions
 	{
-		internal static async Task<byte[]> ToByteArrayAsync(this IInputStream stream)
+		internal static async Task<byte[]?> ToByteArrayAsync(this IInputStream? stream)
 		{
 			if (stream is null)
 			{
@@ -22,7 +22,7 @@ internal static async Task<byte[]> ToByteArrayAsync(this IInputStream stream)
 			return await readStream.ToByteArrayAsync();
 		}
 
-		internal static async Task<byte[]> ToByteArrayAsync(this StorageFile file)
+		internal static async Task<byte[]?> ToByteArrayAsync(this StorageFile? file)
 		{
 			if (file is null)
 			{
diff --git a/src/Files.App/Extensions/ShellNewEntryExtensions.cs b/src/Files.App/Extensions/ShellNewEntryExtensions.cs
index 00cedd074d9b..b29a3badb133 100644
--- a/src/Files.App/Extensions/ShellNewEntryExtensions.cs
+++ b/src/Files.App/Extensions/ShellNewEntryExtensions.cs
@@ -28,28 +28,42 @@ public static async Task<List<ShellNewEntry>> GetNewContextMenuEntries()
 
 		public static async Task<FilesystemResult<BaseStorageFile>> Create(this ShellNewEntry shellEntry, string filePath, IShellPage associatedInstance)
 		{
-			var parentFolder = await associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(filePath));
+			var shellViewModel = associatedInstance.GetRequiredShellViewModel();
+
+			var parentFolder = await shellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(filePath));
 			if (parentFolder)
 			{
-				return await Create(shellEntry, parentFolder, filePath);
+				return await Create(shellEntry, parentFolder.Result, filePath);
 			}
 
 			return new FilesystemResult<BaseStorageFile>(null, parentFolder.ErrorCode);
 		}
 
-		public static async Task<FilesystemResult<BaseStorageFile>> Create(this ShellNewEntry shellEntry, BaseStorageFolder parentFolder, string filePath)
+		public static async Task<FilesystemResult<BaseStorageFile>> Create(this ShellNewEntry shellEntry, BaseStorageFolder? parentFolder, string filePath)
 		{
-			FilesystemResult<BaseStorageFile> createdFile = null;
-			var fileName = Path.GetFileName(filePath);
+			var fileName = Path.GetFileName(filePath)!;
 
+			FilesystemResult<BaseStorageFile> createdFile;
 			if (shellEntry.Template is null)
 			{
-				createdFile = await FilesystemTasks.Wrap(() => parentFolder.CreateFileAsync(fileName, CreationCollisionOption.GenerateUniqueName).AsTask());
+				createdFile = await FilesystemTasks.WrapNullable(
+					() => (parentFolder
+						?? throw new InvalidOperationException("The parent folder could not be resolved."))
+						.CreateFileAsync(fileName, CreationCollisionOption.GenerateUniqueName).AsTask());
 			}
 			else
 			{
-				createdFile = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(shellEntry.Template))
-					.OnSuccess(t => t.CopyAsync(parentFolder, fileName, NameCollisionOption.GenerateUniqueName).AsTask());
+				createdFile = await FilesystemTasks.WrapNullable(
+						() => StorageFileExtensions.DangerousGetFileFromPathAsync(shellEntry.Template))
+					.OnSuccess(async templateFile =>
+					{
+						var sourceFile = templateFile
+							?? throw new InvalidOperationException("The template file could not be resolved.");
+						var destinationFolder = parentFolder
+							?? throw new InvalidOperationException("The parent folder could not be resolved.");
+						return await sourceFile.CopyAsync(destinationFolder, fileName, NameCollisionOption.GenerateUniqueName)
+							?? throw new InvalidOperationException("The template copy did not return a file.");
+					});
 			}
 
 			if (createdFile && shellEntry.Data is not null)
@@ -57,7 +71,9 @@ public static async Task<FilesystemResult<BaseStorageFile>> Create(this ShellNew
 				// Calls unsupported OpenTransactedWriteAsync
 				//await FileIO.WriteBytesAsync(createdFile.Result, shellEntry.Data);
 
-				await createdFile.Result.WriteBytesAsync(shellEntry.Data);
+				var createdItem = createdFile.Result
+					?? throw new InvalidOperationException("The create operation did not return a file.");
+				await createdItem.WriteBytesAsync(shellEntry.Data);
 			}
 
 			return createdFile;
diff --git a/src/Files.App/Helpers/Application/AppLifecycleHelper.cs b/src/Files.App/Helpers/Application/AppLifecycleHelper.cs
index 55c6e4352768..bc4c2b1ca370 100644
--- a/src/Files.App/Helpers/Application/AppLifecycleHelper.cs
+++ b/src/Files.App/Helpers/Application/AppLifecycleHelper.cs
@@ -409,7 +409,8 @@ public static void HandleAppUnhandledException(Exception? ex, bool showToastNoti
 
 					var lastSessionTabList = userSettingsService.GeneralSettingsService.LastSessionTabList;
 
-					if (userSettingsService.GeneralSettingsService.LastCrashedTabList?.SequenceEqual(lastSessionTabList) ?? false)
+					if (lastSessionTabList is not null &&
+						userSettingsService.GeneralSettingsService.LastCrashedTabList?.SequenceEqual(lastSessionTabList) is true)
 					{
 						// Avoid infinite restart loop
 						userSettingsService.GeneralSettingsService.LastSessionTabList = null;
diff --git a/src/Files.App/Helpers/BitmapHelper.cs b/src/Files.App/Helpers/BitmapHelper.cs
index a89301d1ad92..188865abf432 100644
--- a/src/Files.App/Helpers/BitmapHelper.cs
+++ b/src/Files.App/Helpers/BitmapHelper.cs
@@ -64,7 +64,7 @@ public static async Task RotateAsync(string filePath, BitmapRotation rotation)
 				}
 
 				var fileStreamRes = await FilesystemTasks.Wrap(() => file.OpenAsync(FileAccessMode.ReadWrite).AsTask());
-				using IRandomAccessStream fileStream = fileStreamRes.Result;
+				using IRandomAccessStream? fileStream = fileStreamRes.Result;
 				if (fileStream is null)
 				{
 					return;
@@ -148,4 +148,4 @@ public static async Task SaveSoftwareBitmapToFileAsync(SoftwareBitmap softwareBi
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/Dialog/DialogDisplayHelper.cs b/src/Files.App/Helpers/Dialog/DialogDisplayHelper.cs
index db195728ea5c..f7e6d11fe0f6 100644
--- a/src/Files.App/Helpers/Dialog/DialogDisplayHelper.cs
+++ b/src/Files.App/Helpers/Dialog/DialogDisplayHelper.cs
@@ -27,7 +27,7 @@ internal sealed class DialogDisplayHelper
 		/// The (optional) secondary button text.
 		/// If not set, it won't be presented to the user at all.
 		/// </param>
-		public static async Task<bool> ShowDialogAsync(string title, string message, string primaryText = "OK", string secondaryText = null)
+		public static async Task<bool> ShowDialogAsync(string title, string message, string primaryText = "OK", string? secondaryText = null)
 		{
 			var dialog = new DynamicDialog(new DynamicDialogViewModel()
 			{
@@ -58,4 +58,4 @@ public static async Task<DynamicDialogResult> ShowDialogAsync(DynamicDialog dial
 			return DynamicDialogResult.Cancel;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs b/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs
index f8d9ec25512b..d34e35c99e95 100644
--- a/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs
+++ b/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs
@@ -42,7 +42,7 @@ public static DynamicDialog GetFor_ConsentDialog()
 			return dialog;
 		}
 
-		public static DynamicDialog GetFor_ShortcutNotFound(string targetPath)
+		public static DynamicDialog GetFor_ShortcutNotFound(string? targetPath)
 		{
 			DynamicDialog dialog = new(new DynamicDialogViewModel
 			{
@@ -116,7 +116,7 @@ void UpdateDialogState()
 				},
 				PrimaryButtonAction = (vm, e) =>
 				{
-					vm.HideDialog(); // Rename successful
+					vm.Hide(); // Rename successful
 				},
 				PrimaryButtonText = Strings.Create.GetLocalizedResource(),
 				CloseButtonText = Strings.Cancel.GetLocalizedResource(),
@@ -153,7 +153,7 @@ public static DynamicDialog GetFor_CannotRunFileDialog()
 			});
 		}
 
-		public static DynamicDialog GetFor_FileInUseDialog(List<Win32Process> lockingProcess = null)
+		public static DynamicDialog GetFor_FileInUseDialog(List<Win32Process>? lockingProcess = null)
 		{
 			DynamicDialog dialog = new DynamicDialog(new DynamicDialogViewModel()
 			{
@@ -190,25 +190,25 @@ public static DynamicDialog GetFor_CredentialEntryDialog(string path)
 			inputUsername.TextChanged += (textBox, args) =>
 			{
 				userAndPass[0] = inputUsername.Text;
-				dialog.ViewModel.AdditionalData = userAndPass;
+				dialog!.ViewModel.AdditionalData = userAndPass;
 			};
 
 			inputPassword.PasswordChanged += (textBox, args) =>
 			{
 				userAndPass[1] = inputPassword.Password;
-				dialog.ViewModel.AdditionalData = userAndPass;
+				dialog!.ViewModel.AdditionalData = userAndPass;
 			};
 
 			saveCreds.Checked += (textBox, args) =>
 			{
 				userAndPass[2] = "y";
-				dialog.ViewModel.AdditionalData = userAndPass;
+				dialog!.ViewModel.AdditionalData = userAndPass;
 			};
 
 			saveCreds.Unchecked += (textBox, args) =>
 			{
 				userAndPass[2] = "n";
-				dialog.ViewModel.AdditionalData = userAndPass;
+				dialog!.ViewModel.AdditionalData = userAndPass;
 			};
 
 			dialog = new DynamicDialog(new DynamicDialogViewModel()
@@ -236,8 +236,8 @@ public static DynamicDialog GetFor_CredentialEntryDialog(string path)
 				},
 				CloseButtonAction = (vm, e) =>
 				{
-					dialog.ViewModel.AdditionalData = null;
-					vm.HideDialog();
+					vm.AdditionalData = null;
+					vm.Hide();
 				}
 
 			});
@@ -283,8 +283,8 @@ public static DynamicDialog GetFor_GitCheckoutConflicts(string checkoutBranchNam
 				AdditionalData = GitCheckoutOptions.BringChanges,
 				CloseButtonAction = (vm, e) =>
 				{
-					dialog.ViewModel.AdditionalData = GitCheckoutOptions.None;
-					vm.HideDialog();
+					vm.AdditionalData = GitCheckoutOptions.None;
+					vm.Hide();
 				}
 			});
 
@@ -330,8 +330,8 @@ public static DynamicDialog GetFor_GitMergeConflicts(string checkoutBranchName,
 				AdditionalData = GitCheckoutOptions.AbortMerge,
 				CloseButtonAction = (vm, e) =>
 				{
-					dialog.ViewModel.AdditionalData = GitCheckoutOptions.None;
-					vm.HideDialog();
+					vm.AdditionalData = GitCheckoutOptions.None;
+					vm.Hide();
 				}
 			});
 
@@ -373,8 +373,8 @@ public static DynamicDialog GetFor_DeleteGitBranchConfirmation(string branchName
 				AdditionalData = true,
 				CloseButtonAction = (vm, e) =>
 				{
-					dialog.ViewModel.AdditionalData = false;
-					vm.HideDialog();
+					vm.AdditionalData = false;
+					vm.Hide();
 				}
 			});
 
@@ -393,7 +393,7 @@ public static DynamicDialog GetFor_RenameRequiresHigherPermissions(string path)
 				SecondaryButtonAction = (vm, e) =>
 				{
 					var context = Ioc.Default.GetRequiredService<IContentPageContext>();
-					var item = context.ShellPage?.ShellViewModel.FilesAndFolders.FirstOrDefault(li => li.ItemPath.Equals(path));
+					var item = context.ShellPage?.ShellViewModel?.FilesAndFolders.FirstOrDefault(li => li.ItemPath!.Equals(path));
 
 					if (context.ShellPage is not null && item is not null)
 						FilePropertiesHelpers.OpenPropertiesWindow(item, context.ShellPage, PropertiesNavigationViewItemType.Security);
@@ -461,7 +461,7 @@ public static DynamicDialog GetFor_CreateAlternateDataStreamDialog()
 				},
 				PrimaryButtonAction = (vm, e) =>
 				{
-					vm.HideDialog();
+					vm.Hide();
 				},
 				PrimaryButtonText = Strings.Create.GetLocalizedResource(),
 				CloseButtonText = Strings.Cancel.GetLocalizedResource(),
diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs
index aceb3c440e40..327931f0df55 100644
--- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs
+++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs
@@ -205,7 +205,7 @@ public LayoutPreferencesManager(FolderLayoutModes modeOverride) : this()
 
 		// Methods
 
-		public Type GetLayoutType(string path, bool changeLayoutMode = true)
+		public Type GetLayoutType(string? path, bool changeLayoutMode = true)
 		{
 			var preferencesItem = GetLayoutPreferencesForPath(path);
 			if (preferencesItem is null)
@@ -311,7 +311,7 @@ public void ToggleLayoutModeAdaptive()
 			LayoutModeChangeRequested?.Invoke(this, new LayoutModeEventArgs(FolderLayoutModes.Adaptive));
 		}
 
-		public void OnDefaultPreferencesChanged(string path, string settingsName)
+		public void OnDefaultPreferencesChanged(string? path, string settingsName)
 		{
 			var preferencesItem = GetLayoutPreferencesForPath(path);
 			if (preferencesItem is null)
@@ -376,7 +376,7 @@ public static void SetDefaultLayoutPreferences(ColumnsViewModel columns)
 			UserSettingsService.LayoutSettingsService.SyncStatusColumnWidth = columns.StatusColumn.UserLengthPixels;
 		}
 
-		public static void SetLayoutPreferencesForPath(string path, LayoutPreferencesItem preferencesItem)
+		public static void SetLayoutPreferencesForPath(string? path, LayoutPreferencesItem preferencesItem)
 		{
 			if (!UserSettingsService.LayoutSettingsService.SyncFolderPreferencesAcrossDirectories)
 			{
@@ -487,7 +487,7 @@ public static void SetLayoutPreferencesForPath(string path, LayoutPreferencesIte
 			}
 		}
 
-		private static LayoutPreferencesItem? GetLayoutPreferencesForPath(string path)
+		private static LayoutPreferencesItem? GetLayoutPreferencesForPath(string? path)
 		{
 			// Guard against null
 			if (path is null)
@@ -627,4 +627,4 @@ private bool SetProperty<TValue>(Func<LayoutPreferencesItem, TValue> prop, Actio
 			return true;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/LocationHelpers.cs b/src/Files.App/Helpers/LocationHelpers.cs
index fc4757a9bab3..d0342e47ada4 100644
--- a/src/Files.App/Helpers/LocationHelpers.cs
+++ b/src/Files.App/Helpers/LocationHelpers.cs
@@ -8,7 +8,7 @@ namespace Files.App.Helpers
 {
 	public static class LocationHelpers
 	{
-		public static async Task<string> GetAddressFromCoordinatesAsync(double? Lat, double? Lon)
+		public static async Task<string?> GetAddressFromCoordinatesAsync(double? Lat, double? Lon)
 		{
 			if (!Lat.HasValue || !Lon.HasValue)
 				return null;
diff --git a/src/Files.App/Helpers/MediaFileHelper.cs b/src/Files.App/Helpers/MediaFileHelper.cs
index c66850d9ab5e..1ec0a69104b9 100644
--- a/src/Files.App/Helpers/MediaFileHelper.cs
+++ b/src/Files.App/Helpers/MediaFileHelper.cs
@@ -9,7 +9,7 @@ internal sealed class MediaFileHelper
 		/// </summary>
 		/// <param name="filePath">The file path to change the album cover.</param>
 		/// <param name="albumCover">The album cover to use, or <c>null</c> to clear any embedded cover.</param>
-		public static bool ChangeAlbumCover(string filePath, Picture albumCover)
+		public static bool ChangeAlbumCover(string filePath, Picture? albumCover)
 		{
 			try
 			{
@@ -27,4 +27,4 @@ public static bool ChangeAlbumCover(string filePath, Picture albumCover)
 
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/MenuFlyout/MenuFlyoutHelper.cs b/src/Files.App/Helpers/MenuFlyout/MenuFlyoutHelper.cs
index 925bdc971a32..e0c9e6c61eab 100644
--- a/src/Files.App/Helpers/MenuFlyout/MenuFlyoutHelper.cs
+++ b/src/Files.App/Helpers/MenuFlyout/MenuFlyoutHelper.cs
@@ -18,11 +18,11 @@ public sealed class MenuFlyoutItemViewModel : IMenuFlyoutItemViewModel
 		{
 			public string Text { get; init; }
 
-			public ICommand Command { get; init; }
+			public ICommand? Command { get; init; }
 
-			public object CommandParameter { get; init; }
+			public object? CommandParameter { get; init; }
 
-			public string Tooltip { get; init; }
+			public string? Tooltip { get; init; }
 
 			public bool IsEnabled { get; set; } = true;
 
@@ -50,13 +50,17 @@ public MenuFlyoutFactoryItemViewModel(Func<MenuFlyoutItemBase> factoryFunc)
 				=> Build = factoryFunc;
 		}
 
-		public static IEnumerable<IMenuFlyoutItemViewModel> GetItemsSource(DependencyObject obj) => obj.GetValue(ItemsSourceProperty) as IEnumerable<IMenuFlyoutItemViewModel>;
+		public static IEnumerable<IMenuFlyoutItemViewModel>? GetItemsSource(DependencyObject obj) => obj.GetValue(ItemsSourceProperty) as IEnumerable<IMenuFlyoutItemViewModel>;
 
 		public static void SetItemsSource(DependencyObject obj, IEnumerable<IMenuFlyoutItemViewModel> value) => obj.SetValue(ItemsSourceProperty, value);
 
 		public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.RegisterAttached("ItemsSource", typeof(IEnumerable<IMenuFlyoutItemViewModel>), typeof(MenuFlyoutHelper), new PropertyMetadata(null, ItemsSourceChanged));
 
-		private static void ItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => _ = SetupItemsAsync(d as MenuFlyout);
+		private static void ItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			if (d is MenuFlyout menu)
+				_ = SetupItemsAsync(menu);
+		}
 
 		public static bool GetIsVisible(DependencyObject d) => (bool)d.GetValue(IsVisibleProperty);
 
diff --git a/src/Files.App/Helpers/NaturalStringComparer.cs b/src/Files.App/Helpers/NaturalStringComparer.cs
index 003b8ca1f1b3..d7102e6ac07c 100644
--- a/src/Files.App/Helpers/NaturalStringComparer.cs
+++ b/src/Files.App/Helpers/NaturalStringComparer.cs
@@ -6,7 +6,7 @@ namespace Files.App.Helpers
 	// Credit: https://github.com/GihanSoft/NaturalStringComparer
 	public sealed class NaturalStringComparer
 	{
-		public static IComparer<object> GetForProcessor()
+		public static IComparer<object?> GetForProcessor()
 		{
 			return new NaturalComparer(StringComparison.CurrentCultureIgnoreCase);
 		}
diff --git a/src/Files.App/Helpers/Navigation/MultitaskingTabsHelpers.cs b/src/Files.App/Helpers/Navigation/MultitaskingTabsHelpers.cs
index f24bc2d5a97f..da7044223213 100644
--- a/src/Files.App/Helpers/Navigation/MultitaskingTabsHelpers.cs
+++ b/src/Files.App/Helpers/Navigation/MultitaskingTabsHelpers.cs
@@ -5,29 +5,29 @@ namespace Files.App.Helpers
 {
 	public static class MultitaskingTabsHelpers
 	{
-		public static void CloseTabsToTheLeft(TabBarItem clickedTab, ITabBar multitaskingControl)
+		public static void CloseTabsToTheLeft(TabBarItem? clickedTab, ITabBar? multitaskingControl)
 		{
 			if (multitaskingControl is not null)
 			{
 				var tabs = MainPageViewModel.AppInstances;
-				var currentIndex = tabs.IndexOf(clickedTab);
+				var currentIndex = ((System.Collections.IList)tabs).IndexOf(clickedTab);
 
 				tabs.Take(currentIndex).ToList().ForEach(tab => multitaskingControl.CloseTab(tab));
 			}
 		}
 
-		public static void CloseTabsToTheRight(TabBarItem clickedTab, ITabBar multitaskingControl)
+		public static void CloseTabsToTheRight(TabBarItem? clickedTab, ITabBar? multitaskingControl)
 		{
 			if (multitaskingControl is not null)
 			{
 				var tabs = MainPageViewModel.AppInstances;
-				var currentIndex = tabs.IndexOf(clickedTab);
+				var currentIndex = ((System.Collections.IList)tabs).IndexOf(clickedTab);
 
 				tabs.Skip(currentIndex + 1).ToList().ForEach(tab => multitaskingControl.CloseTab(tab));
 			}
 		}
 
-		public static void CloseOtherTabs(TabBarItem clickedTab, ITabBar multitaskingControl)
+		public static void CloseOtherTabs(TabBarItem? clickedTab, ITabBar? multitaskingControl)
 		{
 			if (multitaskingControl is not null)
 			{
@@ -48,7 +48,10 @@ public static void CloseAllTabs(ITabBar multitaskingControl)
 		public static Task MoveTabToNewWindow(TabBarItem tab, ITabBar multitaskingControl)
 		{
 			int index = MainPageViewModel.AppInstances.IndexOf(tab);
-			TabBarItemParameter tabItemArguments = MainPageViewModel.AppInstances[index].NavigationParameter;
+			if (index < 0)
+				return Task.CompletedTask;
+
+			TabBarItemParameter? tabItemArguments = MainPageViewModel.AppInstances[index].NavigationParameter;
 
 			multitaskingControl?.CloseTab(MainPageViewModel.AppInstances[index]);
 
diff --git a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs
index 5d61c1a5bde3..8d1e7bc07671 100644
--- a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs
+++ b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs
@@ -85,7 +85,7 @@ public static async Task AddNewTabByPathAsync(Type type, string? path, bool swit
 				App.AppModel.TabStripSelectedIndex = index;
 		}
 
-		public static async Task AddNewTabByParamAsync(Type type, object tabViewItemArgs, int atIndex = -1, bool switchToNewTab = true)
+		public static async Task AddNewTabByParamAsync(Type type, object? tabViewItemArgs, int atIndex = -1, bool switchToNewTab = true)
 		{
 			var tabItem = new Files.App.UserControls.TabBar.TabBarItem()
 			{
@@ -112,11 +112,11 @@ public static async Task AddNewTabByParamAsync(Type type, object tabViewItemArgs
 				App.AppModel.TabStripSelectedIndex = index;
 		}
 
-		private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigationArg)
+		private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object? navigationArg)
 		{
 			tabItem.AllowStorageItemDrop = true;
 
-			(string, IconSource, string) result = (null, null, null);
+			(string? Header, IconSource? Icon, string? ToolTip) result = default;
 			if (navigationArg is PaneNavigationArguments paneArgs)
 			{
 				if (!string.IsNullOrEmpty(paneArgs.LeftPaneNavPathParam) && !string.IsNullOrEmpty(paneArgs.RightPaneNavPathParam))
@@ -145,7 +145,9 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati
 			// Don't update tabItem if the contents of the tab have already changed
 			if (result.Item1 is not null)
 			{
-				var navigationParameter = tabItem.NavigationParameter.NavigationParameter;
+				var navigationParameter = tabItem.NavigationParameter?.NavigationParameter
+					?? throw new InvalidOperationException("The tab does not have a navigation parameter.");
+
 				var a1 = navigationParameter is PaneNavigationArguments pna1 ? pna1 : new PaneNavigationArguments() { LeftPaneNavPathParam = navigationParameter as string };
 				var a2 = navigationArg is PaneNavigationArguments pna2 ? pna2 : new PaneNavigationArguments() { LeftPaneNavPathParam = navigationArg as string };
 
@@ -212,11 +214,15 @@ private static string[] AncestorHints(string? path)
 			return result.ToArray();
 		}
 
-		public static async Task<ImageSource?> GetIconForPathAsync(string path)
+		public static async Task<ImageSource?> GetIconForPathAsync(string? path)
 		{
 			ImageSource? imageSource;
 			if (string.IsNullOrEmpty(path) || path == "Home")
-				imageSource = new BitmapImage(new Uri(SidebarSectionIcons.For(SectionType.Home)!));
+			{
+				var iconPath = SidebarSectionIcons.For(SectionType.Home)
+					?? throw new InvalidOperationException("The Home sidebar icon is not configured.");
+				imageSource = new BitmapImage(new Uri(iconPath));
+			}
 			else if (path == "ReleaseNotes")
 				imageSource = new BitmapImage(new Uri(AppLifecycleHelper.AppIconPath));
 			else if (path == "Settings")
@@ -246,7 +252,7 @@ private static string[] AncestorHints(string? path)
 			return imageSource;
 		}
 
-		public static async Task<(string tabLocationHeader, IconSource tabIcon, string toolTipText)> GetSelectedTabInfoAsync(string currentPath)
+		public static async Task<(string? tabLocationHeader, IconSource tabIcon, string toolTipText)> GetSelectedTabInfoAsync(string currentPath)
 		{
 			string? tabLocationHeader;
 			IconSource iconSource = new ImageIconSource();
@@ -278,9 +284,11 @@ private static string[] AncestorHints(string? path)
 				tabLocationHeader = Strings.ThisPC.GetLocalizedResource();
 			else if (currentPath.Equals(Constants.UserEnvironmentPaths.NetworkFolderPath, StringComparison.OrdinalIgnoreCase))
 				tabLocationHeader = Strings.Network.GetLocalizedResource();
-			else if (App.LibraryManager.TryGetLibrary(currentPath, out LibraryLocationItem library))
+			else if (App.LibraryManager.TryGetLibrary(currentPath, out var library))
 			{
-				var libName = System.IO.Path.GetFileNameWithoutExtension(library.Path).GetLocalizedResource();
+				var libraryName = System.IO.Path.GetFileNameWithoutExtension(library.Path)
+					?? throw new InvalidOperationException("The library does not have a file name.");
+				var libName = libraryName.GetLocalizedResource();
 				// If localized string is empty use the library name.
 				tabLocationHeader = string.IsNullOrEmpty(libName) ? library.Text : libName;
 			}
@@ -300,19 +308,23 @@ private static string[] AncestorHints(string? path)
 				}
 				else if (PathNormalization.NormalizePath(PathNormalization.GetPathRoot(currentPath)) == normalizedCurrentPath) // If path is a drive's root
 				{
-					var matchingDrive = NetworkService.Computers.Cast<DriveItem>().FirstOrDefault(netDrive => normalizedCurrentPath.Contains(PathNormalization.NormalizePath(netDrive.Path), StringComparison.OrdinalIgnoreCase));
-					matchingDrive ??= DrivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(drive => normalizedCurrentPath.Contains(PathNormalization.NormalizePath(drive.Path), StringComparison.OrdinalIgnoreCase));
+					var matchingDrive = NetworkService.Computers.Cast<DriveItem>().FirstOrDefault(netDrive => normalizedCurrentPath.Contains(
+						PathNormalization.NormalizePath(netDrive.GetRequiredPath()),
+						StringComparison.OrdinalIgnoreCase));
+					matchingDrive ??= DrivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(drive => normalizedCurrentPath.Contains(
+						PathNormalization.NormalizePath(drive.GetRequiredPath()),
+						StringComparison.OrdinalIgnoreCase));
 					tabLocationHeader = matchingDrive is not null ? matchingDrive.Text : normalizedCurrentPath;
 				}
 				else
 				{
 					tabLocationHeader = currentPath.TrimEnd(System.IO.Path.DirectorySeparatorChar, System.IO.Path.AltDirectorySeparatorChar).Split('\\', StringSplitOptions.RemoveEmptyEntries).Last();
 
-					FilesystemResult<StorageFolderWithPath> rootItem = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(currentPath));
+					var rootItem = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(currentPath));
 					if (rootItem)
 					{
-						BaseStorageFolder currentFolder = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(currentPath, rootItem));
-						if (currentFolder is not null && !string.IsNullOrEmpty(currentFolder.DisplayName))
+						var currentFolderResult = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(currentPath, rootItem.Result));
+						if (currentFolderResult.Result is { } currentFolder && !string.IsNullOrEmpty(currentFolder.DisplayName))
 							tabLocationHeader = currentFolder.DisplayName;
 					}
 				}
@@ -337,7 +349,7 @@ public static async Task UpdateInstancePropertiesAsync(object? navigationArg)
 		{
 			await SafetyExtensions.IgnoreExceptions(async () =>
 			{
-				string windowTitle = string.Empty;
+				string? windowTitle = string.Empty;
 				if (navigationArg is PaneNavigationArguments paneArgs)
 				{
 					if (!string.IsNullOrEmpty(paneArgs.LeftPaneNavPathParam) && !string.IsNullOrEmpty(paneArgs.RightPaneNavPathParam))
@@ -347,7 +359,7 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 						windowTitle = $"{leftTabInfo.tabLocationHeader} | {rightTabInfo.tabLocationHeader}";
 					}
 					else
-						(windowTitle, _, _) = await GetSelectedTabInfoAsync(paneArgs.LeftPaneNavPathParam);
+						(windowTitle, _, _) = await GetSelectedTabInfoAsync(paneArgs.LeftPaneNavPathParam ?? string.Empty);
 				}
 				else if (navigationArg is string pathArgs)
 					(windowTitle, _, _) = await GetSelectedTabInfoAsync(pathArgs);
@@ -390,7 +402,9 @@ public static void OpenInSecondaryPane(IShellPage associatedInstance, ListedItem
 			if (associatedInstance is null || listedItem is null)
 				return;
 
-			associatedInstance.PaneHolder?.OpenSecondaryPane((listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath, arrangement);
+			var targetPath = (listedItem as IShortcutItem)?.TargetPath;
+			var path = !string.IsNullOrEmpty(targetPath) ? targetPath : listedItem.GetRequiredPath();
+			associatedInstance.PaneHolder?.OpenSecondaryPane(path, arrangement);
 		}
 
 		public static Task LaunchNewWindowAsync()
@@ -400,13 +414,18 @@ public static Task LaunchNewWindowAsync()
 
 		public static async Task OpenSelectedItemsAsync(IShellPage associatedInstance, bool openViaApplicationPicker = false)
 		{
+			var shellViewModel = associatedInstance.ShellViewModel;
+
 			// Don't open files and folders inside recycle bin
-			if (associatedInstance.ShellViewModel is null ||
-				associatedInstance.ShellViewModel.WorkingDirectory.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal) ||
+			if (shellViewModel is null ||
 				associatedInstance.SlimContentPage?.SelectedItems is null)
 			{
 				return;
 			}
+			var workingDirectory = shellViewModel.WorkingDirectory
+				?? throw new InvalidOperationException("The shell page does not have a working directory.");
+			if (workingDirectory.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
+				return;
 
 			var forceOpenInNewTab = false;
 			var selectedItems = associatedInstance.SlimContentPage.SelectedItems.ToList();
@@ -429,7 +448,8 @@ public static async Task OpenSelectedItemsAsync(IShellPage associatedInstance, b
 					? FilesystemItemType.Directory
 					: FilesystemItemType.File;
 
-				await OpenPath(item.ItemPath, associatedInstance, type, false, openViaApplicationPicker, forceOpenInNewTab: forceOpenInNewTab);
+				var itemPath = item.GetRequiredPath();
+				await OpenPath(itemPath, associatedInstance, type, false, openViaApplicationPicker, forceOpenInNewTab: forceOpenInNewTab);
 
 				if (type == FilesystemItemType.Directory)
 					forceOpenInNewTab = true;
@@ -438,11 +458,16 @@ public static async Task OpenSelectedItemsAsync(IShellPage associatedInstance, b
 
 		public static async Task OpenItemsWithExecutableAsync(IShellPage associatedInstance, IEnumerable<IStorageItemWithPath> items, string executablePath)
 		{
+			var shellViewModel = associatedInstance.ShellViewModel;
+
 			// Don't open files and folders inside recycle bin
-			if (associatedInstance.ShellViewModel is null ||
-				associatedInstance.ShellViewModel.WorkingDirectory.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal) ||
+			if (shellViewModel is null ||
 				associatedInstance.SlimContentPage is null)
 				return;
+			var workingDirectory = shellViewModel.WorkingDirectory
+				?? throw new InvalidOperationException("The shell page does not have a working directory.");
+			if (workingDirectory.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
+				return;
 
 			var arguments = string.Join(" ", items.Select(item => $"\"{item.Path}\""));
 			await Win32Helper.InvokeWin32ComponentAsync(executablePath, associatedInstance, arguments);
@@ -484,7 +509,7 @@ public static async Task<bool> OpenPath(string path, IShellPage associatedInstan
 				return true;
 			}
 
-			string previousDir = associatedInstance.ShellViewModel.WorkingDirectory;
+			string? previousDir = associatedInstance.ShellViewModel.WorkingDirectory;
 
 			var fileAttributes = Win32Helper.GetFileAttributes(path);
 			bool isDirectory = fileAttributes.HasFlag(System.IO.FileAttributes.Directory);
@@ -572,7 +597,7 @@ private static async Task<FilesystemResult> OpenLibrary(string path, IShellPage
 				await OpenPath(forceOpenInNewTab, UserSettingsService.FoldersSettingsService.OpenFoldersInNewTab, path, associatedInstance);
 				opened = (FilesystemResult)true;
 			}
-			else if (App.LibraryManager.TryGetLibrary(path, out LibraryLocationItem library))
+			else if (App.LibraryManager.TryGetLibrary(path, out var library))
 			{
 				opened = (FilesystemResult)await library.CheckDefaultSaveFolderAccess();
 				if (opened)
@@ -614,11 +639,12 @@ private static async Task<FilesystemResult> OpenDirectory(string path, IShellPag
 					opened = await associatedInstance.ShellViewModel.GetFolderWithPathFromPathAsync(path)
 						.OnSuccess((childFolder) =>
 						{
+							var folder = childFolder!;
 							// Add location to Recent Items List.
 							// File.Exists distinguishes an archive root (real file on disk) from an inner path like "archive.zip\sub".
-							if (childFolder.Item is SystemStorageFolder ||
-								(childFolder.Item is ZipStorageFolder && File.Exists(childFolder.Path)))
-								WindowsRecentItemsService.Add(childFolder.Path);
+							if (folder.Item is SystemStorageFolder ||
+								(folder.Item is ZipStorageFolder && File.Exists(folder.Path)))
+								WindowsRecentItemsService.Add(folder.Path);
 						});
 				}
 				if (!opened)
@@ -648,9 +674,9 @@ private static async Task<FilesystemResult> OpenFile(string path, IShellPage ass
 				{
 					if (!FileExtensionHelpers.IsWebLinkFile(path) && associatedInstance.ShellViewModel is not null)
 					{
-						StorageFileWithPath childFile = await associatedInstance.ShellViewModel.GetFileWithPathFromPathAsync(shortcutInfo.TargetPath);
+						var childFileResult = await associatedInstance.ShellViewModel.GetFileWithPathFromPathAsync(shortcutInfo.TargetPath);
 						// Add location to Recent Items List
-						if (childFile?.Item is SystemStorageFile)
+						if (childFileResult.Result is { Item: SystemStorageFile } childFile)
 							WindowsRecentItemsService.Add(childFile.Path);
 					}
 					await Win32Helper.InvokeWin32ComponentAsync(shortcutInfo.TargetPath, associatedInstance, $"{args} {shortcutInfo.Arguments}", shortcutInfo.RunAsAdmin, shortcutInfo.WorkingDirectory);
@@ -670,17 +696,21 @@ private static async Task<FilesystemResult> OpenFile(string path, IShellPage ass
 					opened = await shellViewModel.GetFileWithPathFromPathAsync(path)
 						.OnSuccess(async childFile =>
 						{
+							var file = childFile!;
 							// Add location to Recent Items List
-							if (childFile.Item is SystemStorageFile)
-								WindowsRecentItemsService.Add(childFile.Path);
+							if (file.Item is SystemStorageFile)
+								WindowsRecentItemsService.Add(file.Path);
 
 							if (openViaApplicationPicker)
 							{
+								var storageFile = file.Item
+									?? throw new InvalidOperationException("The file cannot be opened with the application picker because it has no storage item.");
+
 								LauncherOptions options = InitializeWithWindow(new LauncherOptions
 								{
 									DisplayApplicationPicker = true
 								});
-								if (!await Launcher.LaunchFileAsync(childFile.Item, options))
+								if (!await Launcher.LaunchFileAsync(storageFile, options))
 									await ContextMenu.InvokeVerb("openas", path);
 							}
 							else
@@ -704,8 +734,8 @@ private static async Task<FilesystemResult> OpenFile(string path, IShellPage ass
 
 									BaseStorageFileQueryResult? fileQueryResult = null;
 									//Get folder to create a file query (to pass to apps like Photos, Movies & TV..., needed to scroll through the folder like what Windows Explorer does)
-									BaseStorageFolder currentFolder = await shellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(path));
-									if (!launchSuccess && currentFolder is not null)
+									var currentFolderResult = await shellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(path));
+									if (!launchSuccess && currentFolderResult.Result is { } currentFolder)
 									{
 										QueryOptions queryOptions = new(CommonFileQuery.DefaultQuery, null);
 										//We can have many sort entries
@@ -756,17 +786,19 @@ private static async Task<FilesystemResult> OpenFile(string path, IShellPage ass
 											options.NeighboringFilesQuery = fileQueryResult.ToStorageFileQueryResult();
 										}
 										// Now launch file with options.
-										var storageItem = (StorageFile)await FilesystemTasks.Wrap(() => childFile.Item.ToStorageFileAsync().AsTask());
-										if (storageItem is not null)
+										if (file.Item is { } item &&
+											(await FilesystemTasks.Wrap(() => item.ToStorageFileAsync().AsTask())).Result is { } storageItem)
+										{
 											launchSuccess = await Launcher.LaunchFileAsync(storageItem, options);
+										}
 									}
 									if (!launchSuccess)
 										await Win32Helper.InvokeWin32ComponentAsync(path, associatedInstance, args);
 								}
-								else if (childFile.Item is ZipStorageFile zipStorageFile)
+								else if (file.Item is ZipStorageFile zipStorageFile)
 								{
 									var options = InitializeWithWindow(new LauncherOptions());
-									var storageItem = (StorageFile)await FilesystemTasks.Wrap(() => zipStorageFile.ToStorageFileAsync().AsTask());
+									var storageItem = (await FilesystemTasks.Wrap(() => zipStorageFile.ToStorageFileAsync().AsTask())).Result;
 									if (storageItem is null)
 									{
 										await Win32Helper.InvokeWin32ComponentAsync(path, associatedInstance, args);
diff --git a/src/Files.App/Helpers/PathNormalization.cs b/src/Files.App/Helpers/PathNormalization.cs
index de584ea07db0..2954d55afd81 100644
--- a/src/Files.App/Helpers/PathNormalization.cs
+++ b/src/Files.App/Helpers/PathNormalization.cs
@@ -2,13 +2,14 @@
 // Licensed under the MIT License.
 
 using Microsoft.Extensions.Logging;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
 namespace Files.App.Helpers
 {
 	public static class PathNormalization
 	{
-		public static string GetPathRoot(string path)
+		public static string GetPathRoot(string? path)
 		{
 			if (string.IsNullOrEmpty(path))
 				return string.Empty;
@@ -30,7 +31,8 @@ public static string GetPathRoot(string path)
 			return rootPath;
 		}
 
-		public static string NormalizePath(string path)
+		[return: NotNullIfNotNull(nameof(path))]
+		public static string? NormalizePath(string? path)
 		{
 			if (string.IsNullOrEmpty(path))
 				return path;
@@ -58,12 +60,12 @@ public static string NormalizePath(string path)
 			}
 		}
 
-		public static string? TrimPath(this string path)
+		public static string? TrimPath(this string? path)
 		{
 			return path?.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
 		}
 
-		public static string GetParentDir(string path)
+		public static string GetParentDir(string? path)
 		{
 			if (string.IsNullOrEmpty(path))
 				return string.Empty;
@@ -89,4 +91,4 @@ public static string Combine(string folder, string name)
 			return folder.Contains('/', StringComparison.Ordinal) ? Path.Combine(folder, name).Replace('\\', '/') : Path.Combine(folder, name);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/ShareItemHelpers.cs b/src/Files.App/Helpers/ShareItemHelpers.cs
index 564a238ec50f..e75785627e99 100644
--- a/src/Files.App/Helpers/ShareItemHelpers.cs
+++ b/src/Files.App/Helpers/ShareItemHelpers.cs
@@ -68,12 +68,12 @@ async void Manager_DataRequested(DataTransferManager sender, DataRequestedEventA
 					}
 					else if (item.PrimaryItemAttribute == StorageItemTypes.Folder && !item.IsArchive)
 					{
-						if (await StorageHelpers.ToStorageItem<BaseStorageFolder>(item.ItemPath) is BaseStorageFolder folder)
+						if (await StorageHelpers.ToStorageItem<BaseStorageFolder>(item.ItemPath!) is BaseStorageFolder folder)
 							items.Add(folder);
 					}
 					else
 					{
-						if (await StorageHelpers.ToStorageItem<BaseStorageFile>(item.ItemPath) is BaseStorageFile file)
+						if (await StorageHelpers.ToStorageItem<BaseStorageFile>(item.ItemPath!) is BaseStorageFile file)
 							items.Add(file);
 					}
 				}
diff --git a/src/Files.App/Helpers/TransferHelpers.cs b/src/Files.App/Helpers/TransferHelpers.cs
index 00d13b8920fa..a6f8a22e056d 100644
--- a/src/Files.App/Helpers/TransferHelpers.cs
+++ b/src/Files.App/Helpers/TransferHelpers.cs
@@ -35,8 +35,10 @@ await itemsToTransfer.ParallelForEachAsync(async storable =>
 
 					var result = storable switch
 					{
-						IFile => await shellViewModel.GetFileFromPathAsync(storable.Id).OnSuccess(x => items.Add(x)),
-						IFolder => await shellViewModel.GetFolderFromPathAsync(storable.Id).OnSuccess(x => items.Add(x)),
+						IFile => await shellViewModel.GetFileFromPathAsync(storable.Id).OnSuccess(x => items.Add(x
+							?? throw new InvalidOperationException($"The file '{storable.Id}' could not be opened."))),
+						IFolder => await shellViewModel.GetFolderFromPathAsync(storable.Id).OnSuccess(x => items.Add(x
+							?? throw new InvalidOperationException($"The folder '{storable.Id}' could not be opened."))),
 						_ => throw new ArgumentOutOfRangeException(nameof(storable)),
 					};
 
@@ -76,12 +78,12 @@ await itemsToTransfer.ParallelForEachAsync(async storable =>
 
 		public static async Task ExecuteTransferAsync(IContentPageContext context, StatusCenterViewModel statusViewModel, DataPackageOperation type = DataPackageOperation.Copy)
 		{
-			if (context.ShellPage?.SlimContentPage is null ||
-				context.ShellPage.SlimContentPage.IsItemSelected is false)
+			if (context.ShellPage?.SlimContentPage is not { } contentPage ||
+				contentPage.IsItemSelected is false)
 				return;
 
 			// Reset cut mode
-			context.ShellPage.SlimContentPage.ItemManipulationModel.RefreshItemsOpacity();
+			contentPage.ItemManipulationModel.RefreshItemsOpacity();
 
 			ConcurrentBag<IStorageItem> items = [];
 			var itemsCount = context.SelectedItems.Count;
@@ -124,9 +126,13 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 							});
 						}
 
+						var shellViewModel = context.ShellPage.GetRequiredShellViewModel();
+						var itemPath = listedItem.GetRequiredPath();
 						var result = listedItem.PrimaryItemAttribute == StorageItemTypes.File || listedItem is ZipItem
-								? await context.ShellPage.ShellViewModel.GetFileFromPathAsync(listedItem.ItemPath).OnSuccess(t => items.Add(t))
-								: await context.ShellPage.ShellViewModel.GetFolderFromPathAsync(listedItem.ItemPath).OnSuccess(t => items.Add(t));
+								? await shellViewModel.GetFileFromPathAsync(itemPath).OnSuccess(t => items.Add(t
+									?? throw new InvalidOperationException($"The file '{itemPath}' could not be opened.")))
+								: await shellViewModel.GetFolderFromPathAsync(itemPath).OnSuccess(t => items.Add(t
+									?? throw new InvalidOperationException($"The folder '{itemPath}' could not be opened.")));
 
 						if (!result)
 							throw new SystemIO.IOException($"Failed to process {listedItem.ItemPath} in cutting/copying to the clipboard.", (int)result.ErrorCode);
@@ -152,7 +158,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 
 				if ((FileSystemStatusCode)ex.HResult is FileSystemStatusCode.Unauthorized)
 				{
-					var filePaths = context.SelectedItems.Select(x => x.ItemPath).ToArray();
+					var filePaths = context.SelectedItems.Select(x => x.ItemPath!).ToArray();
 					await FileOperationsHelpers.SetClipboard(filePaths, type);
 
 					return;
diff --git a/src/Files.App/Helpers/UI/AppSystemBackdrop.cs b/src/Files.App/Helpers/UI/AppSystemBackdrop.cs
index 233fde8dc89e..875b20e4303b 100644
--- a/src/Files.App/Helpers/UI/AppSystemBackdrop.cs
+++ b/src/Files.App/Helpers/UI/AppSystemBackdrop.cs
@@ -2,18 +2,17 @@
 using Microsoft.UI.Composition.SystemBackdrops;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
-using System.Diagnostics.CodeAnalysis;
 using Windows.UI;
 
 namespace Files.App.Helpers
 {
 	internal sealed partial class AppSystemBackdrop : SystemBackdrop
 	{
-		private bool isSecondaryWindow;
-		private IUserSettingsService userSettingsService;
+		private readonly bool isSecondaryWindow;
+		private readonly IUserSettingsService userSettingsService;
 		private ISystemBackdropControllerWithTargets? controller;
-		private ICompositionSupportsSystemBackdrop target;
-		private XamlRoot root;
+		private ICompositionSupportsSystemBackdrop? target;
+		private XamlRoot? root;
 		private SystemBackdropTheme? prevTheme = null;
 
 		public AppSystemBackdrop(bool isSecondaryWindow = false)
@@ -23,7 +22,6 @@ public AppSystemBackdrop(bool isSecondaryWindow = false)
 			userSettingsService.OnSettingChangedEvent += OnSettingChanged;
 		}
 
-		[MemberNotNull(nameof(target), nameof(root))]
 		protected override void OnTargetConnected(ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
 		{
 			if (target is not null)
@@ -52,8 +50,8 @@ protected override void OnDefaultSystemBackdropConfigurationChanged(IComposition
 		protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop disconnectedTarget)
 		{
 			base.OnTargetDisconnected(disconnectedTarget);
-			this.target = null!;
-			this.root = null!;
+			this.target = null;
+			this.root = null;
 
 
 			try
@@ -71,7 +69,7 @@ protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop
 
 		private void OnSettingChanged(object? sender, SettingChangedEventArgs e)
 		{
-			if (target is null)
+			if (target is null || root is null)
 				return;
 
 			switch (e.SettingName)
diff --git a/src/Files.App/Helpers/UI/DragZoneHelper.cs b/src/Files.App/Helpers/UI/DragZoneHelper.cs
index dbdcb3d9ae59..217ea46dff72 100644
--- a/src/Files.App/Helpers/UI/DragZoneHelper.cs
+++ b/src/Files.App/Helpers/UI/DragZoneHelper.cs
@@ -24,10 +24,7 @@ public static void RaiseSetTitleBarDragRegion(this Window window, SetTitleBarDra
 				return;
 			// UIElement.RasterizationScale is always 1
 			var source = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
-			var uiElement = window.Content;
-			var xamlRoot = uiElement?.XamlRoot;
-
-			if (xamlRoot is null)
+			if (window.Content is not UIElement { XamlRoot: { } xamlRoot } uiElement)
 				return;
 
 			var scaleFactor = xamlRoot.RasterizationScale;
@@ -61,4 +58,4 @@ private static RectInt32 GetScaledRect(this UIElement uiElement, RectInt32? r =
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs b/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs
index 56d2083c35b7..524a2f706500 100644
--- a/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs
+++ b/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs
@@ -18,9 +18,9 @@ public static class UIFilesystemHelpers
 		public static async Task PasteItemAsync(string destinationPath, IShellPage associatedInstance)
 		{
 			FilesystemResult<DataPackageView> packageView = await FilesystemTasks.Wrap(() => Task.FromResult(Clipboard.GetContent()));
-			if (packageView && packageView.Result is not null)
+			if (packageView && packageView.Result is { } content)
 			{
-				await associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(packageView.Result.RequestedOperation, packageView, destinationPath, false, true);
+				await associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(content.RequestedOperation, content, destinationPath, false, true);
 				associatedInstance.SlimContentPage?.ItemManipulationModel?.RefreshItemsOpacity();
 				await associatedInstance.RefreshIfNoWatcherExistsAsync();
 			}
@@ -29,9 +29,11 @@ public static async Task PasteItemAsync(string destinationPath, IShellPage assoc
 		public static async Task PasteItemAsShortcutAsync(string destinationPath, IShellPage associatedInstance)
 		{
 			FilesystemResult<DataPackageView> packageView = await FilesystemTasks.Wrap(() => Task.FromResult(Clipboard.GetContent()));
-			if (packageView.Result.Contains(StandardDataFormats.StorageItems))
+			var content = packageView.Result
+				?? throw new InvalidOperationException("The clipboard content is not available.");
+			if (content.Contains(StandardDataFormats.StorageItems))
 			{
-				var items = await packageView.Result.GetStorageItemsAsync();
+				var items = await content.GetStorageItemsAsync();
 				await Task.WhenAll(items.Select(async item =>
 				{
 					var fileName = FilesystemHelpers.GetShortcutNamingPreference(item.Name);
@@ -50,8 +52,12 @@ public static async Task<bool> RenameFileItemAsync(ListedItem item, string newNa
 		{
 			if (item is AlternateStreamItem ads) // For alternate streams Name is not a substring ItemNameRaw
 			{
-				newName = item.ItemNameRaw.Replace(
-					item.Name.Substring(item.Name.LastIndexOf(':') + 1),
+				var itemNameRaw = item.ItemNameRaw
+					?? throw new InvalidOperationException("The alternate stream does not have a name.");
+				var itemName = item.Name
+					?? throw new InvalidOperationException("The alternate stream does not have a display name.");
+				newName = itemNameRaw.Replace(
+					itemName.Substring(itemName.LastIndexOf(':') + 1),
 					newName.Substring(newName.LastIndexOf(':') + 1),
 					StringComparison.Ordinal);
 				newName = $"{ads.MainStreamName}:{newName}";
@@ -61,7 +67,9 @@ public static async Task<bool> RenameFileItemAsync(ListedItem item, string newNa
 				if (string.IsNullOrEmpty(item.Name))
 					newName = string.Concat(newName, item.FileExtension);
 				else
-					newName = item.ItemNameRaw.Replace(item.Name, newName, StringComparison.Ordinal);
+					newName = (item.ItemNameRaw
+						?? throw new InvalidOperationException("The item does not have a name."))
+						.Replace(item.Name, newName, StringComparison.Ordinal);
 			}
 
 			if (item.ItemNameRaw == newName || string.IsNullOrEmpty(newName))
@@ -69,7 +77,9 @@ public static async Task<bool> RenameFileItemAsync(ListedItem item, string newNa
 
 			FilesystemItemType itemType = (item.PrimaryItemAttribute == StorageItemTypes.Folder) ? FilesystemItemType.Directory : FilesystemItemType.File;
 
-			ReturnResult renamed = await associatedInstance.FilesystemHelpers.RenameAsync(StorageHelpers.FromPathAndType(item.ItemPath, itemType), newName, NameCollisionOption.FailIfExists, true, showExtensionDialog);
+			ReturnResult renamed = await associatedInstance.FilesystemHelpers.RenameAsync(
+				StorageHelpers.FromPathAndType(item.GetRequiredPath(), itemType),
+				newName, NameCollisionOption.FailIfExists, true, showExtensionDialog);
 
 			if (renamed == ReturnResult.Success)
 			{
@@ -93,7 +103,8 @@ public static async Task CreateFileFromDialogResultTypeAsync(AddItemDialogItemTy
 
 			if (associatedInstance.SlimContentPage is not null)
 			{
-				currentPath = associatedInstance.ShellViewModel.WorkingDirectory;
+				var shellViewModel = associatedInstance.GetRequiredShellViewModel();
+				currentPath = shellViewModel.WorkingDirectory;
 				if (App.LibraryManager.TryGetLibrary(currentPath, out var library) &&
 					!library.IsEmpty &&
 					library.Folders.Count == 1) // TODO: handle libraries with multiple folders
@@ -101,7 +112,6 @@ public static async Task CreateFileFromDialogResultTypeAsync(AddItemDialogItemTy
 					currentPath = library.Folders.First();
 				}
 			}
-
 			// Skip rename dialog when ShellNewEntry has a Command (e.g. ".accdb", ".gdoc")
 			string? userInput = null;
 			if (itemType != AddItemDialogItemType.File || itemInfo?.Command is null)
@@ -116,20 +126,20 @@ public static async Task CreateFileFromDialogResultTypeAsync(AddItemDialogItemTy
 			}
 
 			// Create file based on dialog result
-			(ReturnResult Status, IStorageItem Item) created = (ReturnResult.Failed, null);
+			(ReturnResult Status, IStorageItem? Item) created = (ReturnResult.Failed, null);
 			switch (itemType)
 			{
 				case AddItemDialogItemType.Folder:
 					userInput = !string.IsNullOrWhiteSpace(userInput) ? userInput : Strings.NewFolder.GetLocalizedResource();
 					created = await associatedInstance.FilesystemHelpers.CreateAsync(
-						StorageHelpers.FromPathAndType(PathNormalization.Combine(currentPath, userInput), FilesystemItemType.Directory),
+						StorageHelpers.FromPathAndType(PathNormalization.Combine(currentPath ?? string.Empty, userInput), FilesystemItemType.Directory),
 						true);
 					break;
 
 				case AddItemDialogItemType.File:
 					userInput = !string.IsNullOrWhiteSpace(userInput) ? userInput : itemInfo?.Name ?? Strings.NewFile.GetLocalizedResource();
 					created = await associatedInstance.FilesystemHelpers.CreateAsync(
-						StorageHelpers.FromPathAndType(PathNormalization.Combine(currentPath, userInput + itemInfo?.Extension), FilesystemItemType.File),
+						StorageHelpers.FromPathAndType(PathNormalization.Combine(currentPath ?? string.Empty, userInput + itemInfo?.Extension), FilesystemItemType.File),
 						true);
 					break;
 			}
@@ -156,9 +166,12 @@ public static async Task CreateFolderWithSelectionAsync(IShellPage associatedIns
 		{
 			try
 			{
-				var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
-					item.ItemPath,
-					item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
+				if (associatedInstance.SlimContentPage?.SelectedItems is not { } selectedItems)
+					throw new InvalidOperationException("The active file-list selection is not available.");
+
+				var items = selectedItems.Select((item) => StorageHelpers.FromPathAndType(
+					item.GetRequiredPath(),
+					item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory)).ToList();
 				var folder = await CreateFileFromDialogResultTypeForResult(AddItemDialogItemType.Folder, null, associatedInstance);
 				if (folder is null)
 					return;
@@ -186,10 +199,12 @@ public static void SetHiddenAttributeItem(ListedItem item, bool isHidden, ItemMa
 
 		public static async Task CreateShortcutAsync(IShellPage? associatedInstance, IReadOnlyList<ListedItem> selectedItems)
 		{
-			var currentPath = associatedInstance?.ShellViewModel.WorkingDirectory;
+			var currentPath = associatedInstance is null
+				? null
+				: associatedInstance.GetRequiredShellViewModel().WorkingDirectory;
 
 			if (App.LibraryManager.TryGetLibrary(currentPath ?? string.Empty, out var library) && !library.IsEmpty)
-				currentPath = library.DefaultSaveFolder;
+				currentPath = library.DefaultSaveFolder!;
 
 			foreach (ListedItem selectedItem in selectedItems)
 			{
@@ -206,11 +221,14 @@ public static async Task CreateShortcutAsync(IShellPage? associatedInstance, IRe
 
 		public static async Task CreateShortcutFromDialogAsync(IShellPage associatedInstance)
 		{
-			var currentPath = associatedInstance.ShellViewModel.WorkingDirectory;
+			var shellViewModel = associatedInstance.GetRequiredShellViewModel();
+			var currentPath = shellViewModel.WorkingDirectory
+				?? throw new InvalidOperationException("The active shell page does not have a working directory.");
+
 			if (App.LibraryManager.TryGetLibrary(currentPath, out var library) &&
 				!library.IsEmpty)
 			{
-				currentPath = library.DefaultSaveFolder;
+				currentPath = library.DefaultSaveFolder!;
 			}
 
 			var viewModel = new CreateShortcutDialogViewModel(currentPath);
@@ -225,7 +243,7 @@ public static async Task CreateShortcutFromDialogAsync(IShellPage associatedInst
 			await associatedInstance.RefreshIfNoWatcherExistsAsync();
 		}
 
-		public static async Task<bool> HandleShortcutCannotBeCreated(string shortcutName, string destinationPath, string arguments = "")
+		public static async Task<bool> HandleShortcutCannotBeCreated(string shortcutName, string? destinationPath, string? arguments = "")
 		{
 			var result = await DialogDisplayHelper.ShowDialogAsync
 			(
@@ -245,8 +263,9 @@ public static async Task<bool> HandleShortcutCannotBeCreated(string shortcutName
 		/// <summary>
 		/// Updates ListedItem properties for a shortcut
 		/// </summary>
-		public static void UpdateShortcutItemProperties(IShortcutItem item, string targetPath, string arguments, string workingDir, bool runAsAdmin, SHOW_WINDOW_CMD showWindowCommand)
+		public static void UpdateShortcutItemProperties(IShortcutItem item, string? targetPath, string? arguments, string? workingDir, bool runAsAdmin, SHOW_WINDOW_CMD showWindowCommand)
 		{
+			ArgumentNullException.ThrowIfNull(targetPath);
 			item.TargetPath = Environment.ExpandEnvironmentVariables(targetPath);
 			item.Arguments = arguments;
 			item.WorkingDirectory = workingDir;
@@ -279,10 +298,12 @@ public async static Task<StorageCredential> RequestPassword(IPasswordProtectedIt
 
 			if (credentialDialogViewModel.IsAnonymous)
 				return new();
+			if (credentialDialogViewModel.Password is not { } password)
+				throw new InvalidOperationException("A password is required for authenticated credentials.");
 
 			// Can't do more than that to mitigate immutability of strings. Perhaps convert DisposableArray to SecureString immediately?
-			var credentials = new StorageCredential(credentialDialogViewModel.UserName, Encoding.UTF8.GetString(credentialDialogViewModel.Password));
-			credentialDialogViewModel.Password?.Dispose();
+			var credentials = new StorageCredential(credentialDialogViewModel.UserName, Encoding.UTF8.GetString(password));
+			password.Dispose();
 
 			if (isFtp)
 			{
@@ -293,4 +314,4 @@ public async static Task<StorageCredential> RequestPassword(IPasswordProtectedIt
 			return credentials;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/UI/UIHelpers.cs b/src/Files.App/Helpers/UI/UIHelpers.cs
index 3fe0bf992316..aebec2f4e4dc 100644
--- a/src/Files.App/Helpers/UI/UIHelpers.cs
+++ b/src/Files.App/Helpers/UI/UIHelpers.cs
@@ -128,11 +128,11 @@ public static void CloseAllDialogs()
 
 		private static IEnumerable<IconFileInfo> SidebarIconResources = LoadSidebarIconResources();
 
-		private static IconFileInfo ShieldIconResource = LoadShieldIconResource();
+		private static IconFileInfo? ShieldIconResource = LoadShieldIconResource();
 
-		private static IconFileInfo SearchIconResource = LoadSearchIconResource();
+		private static IconFileInfo? SearchIconResource = LoadSearchIconResource();
 
-		public static IconFileInfo GetSidebarIconResourceInfo(int index)
+		public static IconFileInfo? GetSidebarIconResourceInfo(int index)
 		{
 			var icons = UIHelpers.SidebarIconResources;
 			return icons?.FirstOrDefault(x => x.Index == index);
@@ -173,7 +173,7 @@ private static IEnumerable<IconFileInfo> LoadSidebarIconResources()
 			return imageResList;
 		}
 
-		private static IconFileInfo LoadShieldIconResource()
+		private static IconFileInfo? LoadShieldIconResource()
 		{
 			string imageres = Path.Combine(Constants.UserEnvironmentPaths.SystemRootPath, "System32", "imageres.dll");
 			var imageResList = Win32Helper.ExtractSelectedIconsFromDLL(imageres, new List<int>() {
@@ -183,7 +183,7 @@ private static IconFileInfo LoadShieldIconResource()
 			return imageResList.FirstOrDefault();
 		}
 
-		private static IconFileInfo LoadSearchIconResource()
+		private static IconFileInfo? LoadSearchIconResource()
 		{
 			string imageres = Path.Combine(Constants.UserEnvironmentPaths.SystemRootPath, "System32", "imageres.dll");
 			var imageResList = Win32Helper.ExtractSelectedIconsFromDLL(imageres, new List<int>() {
diff --git a/src/Files.App/Helpers/Win32/Win32Helper.Process.cs b/src/Files.App/Helpers/Win32/Win32Helper.Process.cs
index ddffe517f545..390c38dfc9d3 100644
--- a/src/Files.App/Helpers/Win32/Win32Helper.Process.cs
+++ b/src/Files.App/Helpers/Win32/Win32Helper.Process.cs
@@ -12,17 +12,20 @@ namespace Files.App.Helpers
 	/// </summary>
 	public static partial class Win32Helper
 	{
-		public static async Task<bool> InvokeWin32ComponentAsync(string applicationPath, IShellPage associatedInstance, string arguments = null, bool runAsAdmin = false, string workingDirectory = null)
+		public static async Task<bool> InvokeWin32ComponentAsync(string applicationPath, IShellPage? associatedInstance, string? arguments = null, bool runAsAdmin = false, string? workingDirectory = null)
 		{
 			return await InvokeWin32ComponentsAsync(applicationPath.CreateEnumerable(), associatedInstance, arguments, runAsAdmin, workingDirectory);
 		}
 
-		public static async Task<bool> InvokeWin32ComponentsAsync(IEnumerable<string> applicationPaths, IShellPage associatedInstance, string arguments = null, bool runAsAdmin = false, string workingDirectory = null)
+		public static async Task<bool> InvokeWin32ComponentsAsync(IEnumerable<string> applicationPaths, IShellPage? associatedInstance, string? arguments = null, bool runAsAdmin = false, string? workingDirectory = null)
 		{
 			var application = applicationPaths.FirstOrDefault();
 
-			if (string.IsNullOrEmpty(workingDirectory) && associatedInstance?.ShellViewModel != null && !associatedInstance.ShellViewModel.IsSearchResults)
-				workingDirectory = associatedInstance.ShellViewModel.WorkingDirectory;
+			if (string.IsNullOrEmpty(workingDirectory) &&
+				associatedInstance?.ShellViewModel is { IsSearchResults: false } shellViewModel)
+			{
+				workingDirectory = shellViewModel.WorkingDirectory;
+			}
 
 			if (runAsAdmin)
 			{
@@ -31,10 +34,11 @@ public static async Task<bool> InvokeWin32ComponentsAsync(IEnumerable<string> ap
 				{
 					ProcessStartInfo startInfo = new ProcessStartInfo
 					{
-						FileName = application,
-						Arguments = arguments,
+						FileName = application
+							?? throw new InvalidOperationException("No application path was provided."),
+						Arguments = arguments ?? string.Empty,
 						Verb = "runas",
-						WorkingDirectory = workingDirectory,
+						WorkingDirectory = workingDirectory ?? string.Empty,
 						UseShellExecute = true
 					};
 
@@ -54,7 +58,8 @@ public static async Task<bool> InvokeWin32ComponentsAsync(IEnumerable<string> ap
 			}
 			else
 			{
-				return await LaunchHelper.LaunchAppAsync(application, arguments, workingDirectory);
+				return await LaunchHelper.LaunchAppAsync(application
+					?? throw new InvalidOperationException("No application path was provided."), arguments, workingDirectory);
 			}
 		}
 
diff --git a/src/Files.App/Helpers/Win32/Win32Helper.Shell.cs b/src/Files.App/Helpers/Win32/Win32Helper.Shell.cs
index ef0562e846f9..f64955b12e87 100644
--- a/src/Files.App/Helpers/Win32/Win32Helper.Shell.cs
+++ b/src/Files.App/Helpers/Win32/Win32Helper.Shell.cs
@@ -16,7 +16,7 @@ namespace Files.App.Helpers
 	/// </summary>
 	public static partial class Win32Helper
 	{
-		public static async Task<(ShellFileItem Folder, List<ShellFileItem> Enumerate)> GetShellFolderAsync(string path, bool getFolder, bool getEnumerate, int from, int count, params string[] properties)
+		public static async Task<(ShellFileItem? Folder, List<ShellFileItem> Enumerate)> GetShellFolderAsync(string path, bool getFolder, bool getEnumerate, int from, int count, params string[] properties)
 		{
 			if (path.StartsWith("::{", StringComparison.Ordinal))
 			{
@@ -26,7 +26,7 @@ public static partial class Win32Helper
 			return await STATask.Run(() =>
 			{
 				var flc = new List<ShellFileItem>();
-				var folder = (ShellFileItem)null;
+				ShellFileItem? folder = null;
 
 				try
 				{
@@ -56,6 +56,8 @@ public static partial class Win32Helper
 								var shellFileItem = folderItem is ShellLink link ?
 									ShellFolderExtensions.GetShellLinkItem(link) :
 									ShellFolderExtensions.GetShellFileItem(folderItem);
+								if (shellFileItem is null)
+									continue;
 
 								foreach (var prop in properties)
 									shellFileItem.Properties[prop] = SafetyExtensions.IgnoreExceptions(() => folderItem.Properties[prop]);
@@ -84,7 +86,7 @@ public static partial class Win32Helper
 		public static unsafe string GetFolderFromKnownFolderGUID(Guid guid)
 		{
 			PWSTR pszPath;
-			PInvoke.SHGetKnownFolderPath(ref guid, (KNOWN_FOLDER_FLAG)0, null, out pszPath);
+			PInvoke.SHGetKnownFolderPath(in guid, (KNOWN_FOLDER_FLAG)0, null, out pszPath);
 			string path = pszPath.ToString();
 			Marshal.FreeCoTaskMem((nint)pszPath.Value);
 
diff --git a/src/Files.App/Helpers/Win32/Win32Helper.Storage.cs b/src/Files.App/Helpers/Win32/Win32Helper.Storage.cs
index 65f047c1b150..dd3a47507917 100644
--- a/src/Files.App/Helpers/Win32/Win32Helper.Storage.cs
+++ b/src/Files.App/Helpers/Win32/Win32Helper.Storage.cs
@@ -84,8 +84,11 @@ public static string ExtractStringFromDLL(string file, int number)
 		/// <param name="path"></param>
 		/// <param name="isDirectory"></param>
 		/// <returns></returns>
-		public static byte[]? GetIconOverlay(string path, bool isDirectory)
+		public static byte[]? GetIconOverlay(string? path, bool isDirectory)
 		{
+			if (path is null)
+				return null;
+
 			var shFileInfo = new Shell32.SHFILEINFO();
 			const Shell32.SHGFI flags = Shell32.SHGFI.SHGFI_OVERLAYINDEX | Shell32.SHGFI.SHGFI_ICON | Shell32.SHGFI.SHGFI_SYSICONINDEX | Shell32.SHGFI.SHGFI_ICONLOCATION;
 			byte[]? overlayData = null;
@@ -115,8 +118,10 @@ public static string ExtractStringFromDLL(string file, int number)
 						if (!hOverlay.IsNull && !hOverlay.IsInvalid)
 						{
 							using var icon = hOverlay.ToIcon();
-							using var image = icon.ToBitmap();
+							if (icon is null)
+								return null;
 
+							using var image = icon.ToBitmap();
 							overlayData = (byte[]?)new ImageConverter().ConvertTo(image, typeof(byte[]));
 						}
 					}
@@ -143,7 +148,7 @@ public static string ExtractStringFromDLL(string file, int number)
 		/// <param name="iconOptions"></param>
 		/// <returns></returns>
 		public static byte[]? GetIcon(
-			string path,
+			string? path,
 			int size,
 			bool isFolder,
 			IconOptions iconOptions)
@@ -224,9 +229,12 @@ public static string ExtractStringFromDLL(string file, int number)
 								if (!hIcon.IsNull && !hIcon.IsInvalid)
 								{
 									using (var icon = hIcon.ToIcon())
-									using (var image = icon.ToBitmap())
 									{
-										iconData = (byte[]?)new ImageConverter().ConvertTo(image, typeof(byte[]));
+										if (icon is not null)
+										{
+											using var image = icon.ToBitmap();
+											iconData = (byte[]?)new ImageConverter().ConvertTo(image, typeof(byte[]));
+										}
 									}
 								}
 							}
@@ -378,7 +386,7 @@ public static bool SetCustomDirectoryIcon(string? folderPath, string? iconFile,
 			var fcs = new Shell32.SHFOLDERCUSTOMSETTINGS()
 			{
 				dwMask = Shell32.FOLDERCUSTOMSETTINGSMASK.FCSM_ICONFILE,
-				pszIconFile = iconFile,
+				pszIconFile = iconFile!,
 				cchIconFile = 0,
 				iIconIndex = iconIndex,
 			};
@@ -561,6 +569,8 @@ public static void BringToForeground(IEnumerable<HWND> currentWindows)
 		public static string? PathFromFileId(ulong frn, string volumeHint)
 		{
 			string? volumePath = Path.GetPathRoot(volumeHint);
+			if (string.IsNullOrEmpty(volumePath))
+				return null;
 
 			using var volumeHandle = Kernel32.CreateFile(volumePath, Kernel32.FileAccess.GENERIC_READ, FileShare.Read, null, FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_BACKUP_SEMANTICS);
 			if (volumeHandle.IsInvalid)
@@ -601,8 +611,7 @@ public static void OpenFolderInExistingShellWindow(string folderPath)
 				{
 					var item = shellWindows.Item(i);
 
-					var serv = (Shell32.IServiceProvider)item;
-					if (serv is not null)
+					if (item is Shell32.IServiceProvider serv)
 					{
 						if (serv.QueryService(Shell32.SID_STopLevelBrowser, typeof(Shell32.IShellBrowser).GUID, out var ppv).Succeeded)
 						{
@@ -612,9 +621,9 @@ public static void OpenFolderInExistingShellWindow(string folderPath)
 							using var targetFolder = SafetyExtensions.IgnoreExceptions(() => new Vanara.Windows.Shell.ShellItem(folderPath));
 							if (targetFolder is not null)
 							{
-								if (shellBrowser.QueryActiveShellView(out var shellView).Succeeded)
+								if (shellBrowser.QueryActiveShellView(out var shellView).Succeeded &&
+									shellView is Shell32.IFolderView folderView)
 								{
-									var folderView = (Shell32.IFolderView)shellView;
 									var folder = folderView.GetFolder<Shell32.IPersistFolder2>();
 									var folderPidl = new Shell32.PIDL(IntPtr.Zero);
 
@@ -647,7 +656,8 @@ public static void OpenFolderInExistingShellWindow(string folderPath)
 						Marshal.ReleaseComObject(serv);
 					}
 
-					Marshal.ReleaseComObject(item);
+					if (item is not null)
+						Marshal.ReleaseComObject(item);
 				}
 
 				Marshal.ReleaseComObject(shellWindows);
@@ -666,7 +676,7 @@ public static void OpenFolderInExistingShellWindow(string folderPath)
 			}
 		}
 
-		public static async Task<bool> InstallInf(string filePath)
+		public static async Task<bool> InstallInf(string? filePath)
 		{
 			try
 			{
@@ -751,7 +761,7 @@ public static SafeFileHandle CreateFileForWrite(string filePath, bool overwrite
 				(uint)FILE_ACCESS_RIGHTS.FILE_GENERIC_WRITE, 0, IntPtr.Zero, overwrite ? Win32PInvoke.CREATE_ALWAYS : Win32PInvoke.OPEN_ALWAYS, (uint)Win32PInvoke.File_Attributes.BackupSemantics, IntPtr.Zero), true);
 		}
 
-		public static SafeFileHandle OpenFileForRead(string filePath, bool readWrite = false, uint flags = 0)
+		public static SafeFileHandle OpenFileForRead(string? filePath, bool readWrite = false, uint flags = 0)
 		{
 			return new SafeFileHandle(Win32PInvoke.CreateFileFromApp(filePath,
 				(uint)FILE_ACCESS_RIGHTS.FILE_GENERIC_READ | (uint)(readWrite ? FILE_ACCESS_RIGHTS.FILE_GENERIC_WRITE : 0u), (uint)(Win32PInvoke.FILE_SHARE_READ | (readWrite ? 0 : Win32PInvoke.FILE_SHARE_WRITE)), IntPtr.Zero, Win32PInvoke.OPEN_EXISTING, (uint)Win32PInvoke.File_Attributes.BackupSemantics | flags, IntPtr.Zero), true);
@@ -858,7 +868,7 @@ public static unsafe bool SetCompressionAttributeIoctl(string lpFileName, bool i
 			return result;
 		}
 
-		public static string ReadStringFromFile(string filePath)
+		public static string? ReadStringFromFile(string filePath)
 		{
 			IntPtr hFile = Win32PInvoke.CreateFileFromApp(filePath,
 				(uint)FILE_ACCESS_RIGHTS.FILE_GENERIC_READ,
@@ -949,7 +959,7 @@ public static bool WriteBufferToFileWithProgress(string filePath, byte[] buffer,
 		}
 
 		// https://www.pinvoke.net/default.aspx/kernel32/GetFileInformationByHandleEx.html
-		public static ulong? GetFolderFRN(string folderPath)
+		public static ulong? GetFolderFRN(string? folderPath)
 		{
 			using var handle = OpenFileForRead(folderPath);
 			if (!handle.IsInvalid)
@@ -994,7 +1004,7 @@ public static bool WriteBufferToFileWithProgress(string filePath, byte[] buffer,
 		}
 
 		// https://github.com/rad1oactive/BetterExplorer/blob/master/Windows%20API%20Code%20Pack%201.1/source/WindowsAPICodePack/Shell/ReparsePoint.cs
-		public static string ParseSymLink(string path)
+		public static string? ParseSymLink(string path)
 		{
 			using var handle = OpenFileForRead(path, false, 0x00200000);
 			if (!handle.IsInvalid)
@@ -1038,9 +1048,11 @@ public static string ParseSymLink(string path)
 					// The documentation for FindFirstStreamW says that it is always a ::$DATA
 					// stream type, but FindNextStreamW doesn't guarantee that for subsequent
 					// streams so we check to make sure
-					if (findStreamData.cStreamName.EndsWith(":$DATA") && findStreamData.cStreamName != "::$DATA")
+					var streamName = findStreamData.cStreamName
+						?? throw new InvalidDataException("The alternate-stream enumeration returned an item without a name.");
+					if (streamName.EndsWith(":$DATA") && streamName != "::$DATA")
 					{
-						yield return (findStreamData.cStreamName, findStreamData.StreamSize);
+						yield return (streamName, findStreamData.StreamSize);
 					}
 				}
 				while (Win32PInvoke.FindNextStreamW(hFile, findStreamData));
diff --git a/src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs b/src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs
index 814a9c30eee4..20fcd8056ff6 100644
--- a/src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs
+++ b/src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs
@@ -104,7 +104,7 @@ public static extern bool DeviceIoControl(
 
 		[DllImport("api-ms-win-core-file-fromapp-l1-1-0.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
 		public static extern IntPtr CreateFileFromApp(
-			string lpFileName,
+			string? lpFileName,
 			uint dwDesiredAccess,
 			uint dwShareMode,
 			IntPtr SecurityAttributes,
diff --git a/src/Files.App/Helpers/Win32/Win32PInvoke.Structs.cs b/src/Files.App/Helpers/Win32/Win32PInvoke.Structs.cs
index fec7a25f37e4..e3d19a8c4c8b 100644
--- a/src/Files.App/Helpers/Win32/Win32PInvoke.Structs.cs
+++ b/src/Files.App/Helpers/Win32/Win32PInvoke.Structs.cs
@@ -99,7 +99,7 @@ public sealed class WIN32_FIND_STREAM_DATA
 		{
 			public long StreamSize;
 			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 296)]
-			public string cStreamName;
+			public string? cStreamName;
 		}
 
 		[StructLayout(LayoutKind.Sequential)]
diff --git a/src/Files.App/Helpers/Xaml/DependencyObjectHelpers.cs b/src/Files.App/Helpers/Xaml/DependencyObjectHelpers.cs
index 938bf6917776..5c64c153ca97 100644
--- a/src/Files.App/Helpers/Xaml/DependencyObjectHelpers.cs
+++ b/src/Files.App/Helpers/Xaml/DependencyObjectHelpers.cs
@@ -9,7 +9,7 @@ namespace Files.App.Helpers
 {
 	public static class DependencyObjectHelpers
 	{
-		public static T FindChild<T>(DependencyObject startNode) where T : DependencyObject
+		public static T? FindChild<T>(DependencyObject startNode) where T : DependencyObject
 		{
 			int count = VisualTreeHelper.GetChildrenCount(startNode);
 			for (int i = 0; i < count; i++)
@@ -29,7 +29,7 @@ public static T FindChild<T>(DependencyObject startNode) where T : DependencyObj
 			return null;
 		}
 
-		public static T FindChild<T>(DependencyObject startNode, Func<T, bool> predicate) where T : DependencyObject
+		public static T? FindChild<T>(DependencyObject startNode, Func<T, bool> predicate) where T : DependencyObject
 		{
 			int count = VisualTreeHelper.GetChildrenCount(startNode);
 			for (int i = 0; i < count; i++)
@@ -70,14 +70,14 @@ public static IEnumerable<T> FindChildren<T>(DependencyObject startNode) where T
 			}
 		}
 
-		public static T FindParent<T>(DependencyObject child) where T : DependencyObject
+		public static T? FindParent<T>(DependencyObject? child) where T : DependencyObject
 		{
-			T parent = null;
+			T? parent = null;
 			if (child is null)
 			{
 				return parent;
 			}
-			DependencyObject CurrentParent = VisualTreeHelper.GetParent(child);
+			DependencyObject? CurrentParent = VisualTreeHelper.GetParent(child);
 			while (CurrentParent is not null)
 			{
 				if (CurrentParent is T)
@@ -90,4 +90,4 @@ public static T FindParent<T>(DependencyObject child) where T : DependencyObject
 			return parent;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Helpers/Xaml/SystemTypeToXaml.cs b/src/Files.App/Helpers/Xaml/SystemTypeToXaml.cs
index 8ea8c858c5cb..2080e17a5594 100644
--- a/src/Files.App/Helpers/Xaml/SystemTypeToXaml.cs
+++ b/src/Files.App/Helpers/Xaml/SystemTypeToXaml.cs
@@ -9,7 +9,7 @@ public sealed partial class SystemTypeToXaml : MarkupExtension
 	{
 		#region Private Members
 
-		private object parameter;
+		private object? parameter;
 
 		#endregion Private Members
 
@@ -27,7 +27,8 @@ public sealed partial class SystemTypeToXaml : MarkupExtension
 
 		protected override object ProvideValue()
 		{
-			return parameter;
+			return parameter
+				?? throw new InvalidOperationException("A value must be supplied to the markup extension.");
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/MainWindow.xaml.cs b/src/Files.App/MainWindow.xaml.cs
index b5bf7fd00115..c6ffc69052b7 100644
--- a/src/Files.App/MainWindow.xaml.cs
+++ b/src/Files.App/MainWindow.xaml.cs
@@ -50,7 +50,7 @@ public void ShowSplashScreen()
 			rootFrame?.Navigate(typeof(SplashScreenPage));
 		}
 
-		public async Task InitializeApplicationAsync(object activatedEventArgs)
+		public async Task InitializeApplicationAsync(object? activatedEventArgs)
 		{
 			var rootFrame = EnsureWindowIsInitialized();
 
@@ -113,8 +113,8 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 							int.TryParse(parsedArgs[2].Split('&')[0], out var dx) &&
 							int.TryParse(parsedArgs[3], out var dy))
 							AppWindow?.Move(new(dx - 100, dy - 16));
-						var folder = (StorageFolder)await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(unescapedValue).AsTask());
-						if (folder is not null && !string.IsNullOrEmpty(folder.Path))
+						var folderResult = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(unescapedValue).AsTask());
+						if (folderResult.Result is { } folder && !string.IsNullOrEmpty(folder.Path))
 						{
 							// Convert short name to long name (#6190)
 							unescapedValue = folder.Path;
@@ -229,7 +229,12 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 		private async Task EnsureContentHasKeyboardFocusAsync()
 		{
 			await Task.Delay(100);
-			Ioc.Default.GetService<IContentPageContext>()?.ShellPage?.PaneHolder.FocusActivePane();
+			var shellPage = Ioc.Default.GetService<IContentPageContext>()?.ShellPage;
+			if (shellPage is not null)
+			{
+				var paneHolder = shellPage.GetRequiredPaneHolder();
+				paneHolder.FocusActivePane();
+			}
 		}
 
 		private Frame? EnsureWindowIsInitialized()
@@ -262,13 +267,13 @@ private async Task EnsureContentHasKeyboardFocusAsync()
 
 		private async Task InitializeFromCmdLineArgsAsync(Frame rootFrame, ParsedCommands parsedCommands, string activationPath = "")
 		{
-			async Task PerformNavigationAsync(string payload, string selectItem = null)
+			async Task PerformNavigationAsync(string? payload, string? selectItem = null)
 			{
 				if (!string.IsNullOrEmpty(payload))
 				{
-					payload = Constants.UserEnvironmentPaths.ShellPlaces.Get(payload.ToUpperInvariant(), payload);
-					var folder = (StorageFolder)await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(payload).AsTask());
-					if (folder is not null && !string.IsNullOrEmpty(folder.Path))
+					payload = Constants.UserEnvironmentPaths.ShellPlaces.Get(payload.ToUpperInvariant(), payload) ?? payload;
+					var folderResult = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(payload).AsTask());
+					if (folderResult.Result is { } folder && !string.IsNullOrEmpty(folder.Path))
 						payload = folder.Path; // Convert short name to long name (#6190)
 				}
 
@@ -303,7 +308,7 @@ async Task PerformNavigationAsync(string payload, string selectItem = null)
 					var existingTabIndex = MainPageViewModel.AppInstances
 						.Select((tabItem, idx) => new { tabItem, idx })
 						.FirstOrDefault(x =>
-							x.tabItem.NavigationParameter.NavigationParameter is PaneNavigationArguments paneArgs &&
+							x.tabItem.NavigationParameter!.NavigationParameter is PaneNavigationArguments paneArgs &&
 							(paneNavigationArgs.LeftPaneNavPathParam == paneArgs.LeftPaneNavPathParam ||
 							paneNavigationArgs.LeftPaneNavPathParam == paneArgs.RightPaneNavPathParam))?.idx ?? -1;
 
@@ -332,7 +337,7 @@ x.tabItem.NavigationParameter.NavigationParameter is PaneNavigationArguments pan
 						break;
 
 					case ParsedCommandType.TagFiles:
-						var tagService = Ioc.Default.GetService<IFileTagsSettingsService>();
+						var tagService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 						var tag = tagService.GetTagsByName(command.Payload).FirstOrDefault();
 						foreach (var file in command.Args.Skip(1))
 						{
diff --git a/src/Files.App/Services/App/AppUpdateSideloadService.cs b/src/Files.App/Services/App/AppUpdateSideloadService.cs
index 0a9b4b06f235..caacaa741e37 100644
--- a/src/Files.App/Services/App/AppUpdateSideloadService.cs
+++ b/src/Files.App/Services/App/AppUpdateSideloadService.cs
@@ -95,15 +95,21 @@ public async Task CheckForUpdatesAsync()
 
 				ArgumentNullException.ThrowIfNull(appInstaller);
 
+				var remotePackageName = appInstaller.MainBundle?.Name;
+				if (string.IsNullOrWhiteSpace(remotePackageName) || string.IsNullOrWhiteSpace(appInstaller.Version))
+				{
+					throw new InvalidDataException("The app installer manifest does not identify a package and version.");
+				}
+
 				var remoteVersion = new Version(appInstaller.Version);
 
 				Logger?.LogInformation($"SIDELOAD: Current Package Name: {PackageName}");
-				Logger?.LogInformation($"SIDELOAD: Remote Package Name: {appInstaller.MainBundle.Name}");
+				Logger?.LogInformation($"SIDELOAD: Remote Package Name: {remotePackageName}");
 				Logger?.LogInformation($"SIDELOAD: Current Version: {PackageVersion}");
 				Logger?.LogInformation($"SIDELOAD: Remote Version: {remoteVersion}");
 
 				// Check details and version number
-				if (appInstaller.MainBundle.Name.Equals(PackageName) && remoteVersion.CompareTo(PackageVersion) > 0)
+				if (remotePackageName.Equals(PackageName) && remoteVersion.CompareTo(PackageVersion) > 0)
 				{
 					Logger?.LogInformation("SIDELOAD: Update found.");
 					MainWindow.Instance.DispatcherQueue.TryEnqueue(() =>
@@ -255,24 +261,24 @@ public void Dispose()
 	public sealed class AppInstaller
 	{
 		[XmlElement("MainBundle")]
-		public MainBundle MainBundle { get; set; }
+		public MainBundle? MainBundle { get; set; }
 
 		[XmlAttribute("Uri")]
-		public string Uri { get; set; }
+		public string? Uri { get; set; }
 
 		[XmlAttribute("Version")]
-		public string Version { get; set; }
+		public string? Version { get; set; }
 	}
 
 	public sealed class MainBundle
 	{
 		[XmlAttribute("Name")]
-		public string Name { get; set; }
+		public string? Name { get; set; }
 
 		[XmlAttribute("Version")]
-		public string Version { get; set; }
+		public string? Version { get; set; }
 
 		[XmlAttribute("Uri")]
-		public string Uri { get; set; }
+		public string? Uri { get; set; }
 	}
 }
diff --git a/src/Files.App/Services/DateTimeFormatter/UserDateTimeFormatter.cs b/src/Files.App/Services/DateTimeFormatter/UserDateTimeFormatter.cs
index d5ce1d04e068..cf108fc6ae20 100644
--- a/src/Files.App/Services/DateTimeFormatter/UserDateTimeFormatter.cs
+++ b/src/Files.App/Services/DateTimeFormatter/UserDateTimeFormatter.cs
@@ -7,7 +7,7 @@ internal sealed class UserDateTimeFormatter : IDateTimeFormatter
 	{
 		public IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-		private IDateTimeFormatter formatter;
+		private IDateTimeFormatter formatter = null!;
 
 		public string Name
 			=> formatter.Name;
@@ -31,12 +31,12 @@ public ITimeSpanLabel ToTimeSpanLabel(DateTimeOffset offset, GroupByDateUnit uni
 		private void Update()
 		{
 			var dateTimeFormat = UserSettingsService.GeneralSettingsService.DateTimeFormat;
-			var factory = Ioc.Default.GetService<IDateTimeFormatterFactory>();
+			var factory = Ioc.Default.GetRequiredService<IDateTimeFormatterFactory>();
 
 			formatter = factory.GetDateTimeFormatter(dateTimeFormat);
 		}
 
-		private void UserSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)
+		private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)
 		{
 			if (e.SettingName is nameof(UserSettingsService.GeneralSettingsService.DateTimeFormat))
 				Update();
diff --git a/src/Files.App/Services/Git/LibGit2Service.cs b/src/Files.App/Services/Git/LibGit2Service.cs
index fc96980da5cc..095120bed523 100644
--- a/src/Files.App/Services/Git/LibGit2Service.cs
+++ b/src/Files.App/Services/Git/LibGit2Service.cs
@@ -44,7 +44,7 @@ public bool IsExecutingGitAction
 	public event PropertyChangedEventHandler? IsExecutingGitActionChanged;
 	public event EventHandler? GitFetchCompleted;
 
-	public string? GetGitRepositoryPath(string? path, string root)
+	public string? GetGitRepositoryPath(string? path, string? root)
 	{
 		if (string.IsNullOrEmpty(root))
 			return null;
@@ -182,7 +182,9 @@ public async Task<bool> Checkout(string? repositoryPath, string? branch)
 			var dialog = DynamicDialogFactory.GetFor_GitMergeConflicts(checkoutBranch.FriendlyName, repository.Head.FriendlyName);
 			await dialog.ShowAsync();
 
-			var resolveConflictOption = (GitCheckoutOptions)dialog.ViewModel.AdditionalData;
+			var resolveConflictOption = dialog.ViewModel.AdditionalData is GitCheckoutOptions option
+				? option
+				: GitCheckoutOptions.None;
 
 			switch (resolveConflictOption)
 			{
@@ -199,7 +201,9 @@ public async Task<bool> Checkout(string? repositoryPath, string? branch)
 			var dialog = DynamicDialogFactory.GetFor_GitCheckoutConflicts(checkoutBranch.FriendlyName, repository.Head.FriendlyName);
 			await dialog.ShowAsync();
 
-			var resolveConflictOption = (GitCheckoutOptions)dialog.ViewModel.AdditionalData;
+			var resolveConflictOption = dialog.ViewModel.AdditionalData is GitCheckoutOptions option
+				? option
+				: GitCheckoutOptions.None;
 
 			switch (resolveConflictOption)
 			{
diff --git a/src/Files.App/Services/Settings/FileTagsSettingsService.cs b/src/Files.App/Services/Settings/FileTagsSettingsService.cs
index 78d85f2b4e1e..707b97d33d62 100644
--- a/src/Files.App/Services/Settings/FileTagsSettingsService.cs
+++ b/src/Files.App/Services/Settings/FileTagsSettingsService.cs
@@ -10,9 +10,9 @@ namespace Files.App.Services.Settings
 {
 	internal sealed class FileTagsSettingsService : BaseJsonSettings, IFileTagsSettingsService
 	{
-		public event EventHandler OnSettingImportedEvent;
+		public event EventHandler? OnSettingImportedEvent;
 
-		public event EventHandler OnTagsUpdated;
+		public event EventHandler? OnTagsUpdated;
 
 		private static readonly List<TagViewModel> DefaultFileTags =
 		[
@@ -24,22 +24,24 @@ internal sealed class FileTagsSettingsService : BaseJsonSettings, IFileTagsSetti
 
 		public FileTagsSettingsService()
 		{
-			SettingsSerializer = new DefaultSettingsSerializer();
+			var settingsSerializer = new DefaultSettingsSerializer();
+			SettingsSerializer = settingsSerializer;
 
 			Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path,
 				Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.FileTagSettingsFileName));
 
-			JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
-			JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
+			var jsonSettingsSerializer = new DefaultJsonSettingsSerializer();
+			JsonSettingsSerializer = jsonSettingsSerializer;
+			JsonSettingsDatabase = new CachingJsonSettingsDatabase(settingsSerializer, jsonSettingsSerializer);
 		}
 
 		public IList<TagViewModel> FileTagList
 		{
 			get
 			{
-				var tags = Get<List<TagViewModel>>(DefaultFileTags);
+				var tags = Get<List<TagViewModel>>(DefaultFileTags) ?? DefaultFileTags;
 
-				foreach (var tag in tags!)
+				foreach (var tag in tags)
 					tag.Color = ColorHelpers.FromHex(tag.Color).ToString();
 
 				return tags;
@@ -47,11 +49,11 @@ public IList<TagViewModel> FileTagList
 			set
 			{
 				Set(value);
-				OnTagsUpdated.Invoke(this, EventArgs.Empty);
+				OnTagsUpdated?.Invoke(this, EventArgs.Empty);
 			}
 		}
 
-		public TagViewModel GetTagById(string uid)
+		public TagViewModel? GetTagById(string uid)
 		{
 			if (FileTagList.Any(x => x.Uid is null))
 			{
@@ -70,11 +72,11 @@ public TagViewModel GetTagById(string uid)
 			return tag;
 		}
 
-		public IList<TagViewModel>? GetTagsByIds(string[] uids)
+		public IList<TagViewModel>? GetTagsByIds(string[]? uids)
 		{
 			return uids is null || uids.Length == 0
 				? null
-				: uids.Select(x => GetTagById(x)).Where(x => x is not null).ToList();
+				: uids.Select(GetTagById).WhereNotNull().ToList();
 		}
 
 		public IEnumerable<TagViewModel> GetTagsByName(string tagName)
@@ -122,7 +124,7 @@ public override bool ImportSettings(object import)
 		{
 			if (import is string importString)
 			{
-				var settings = JsonSettingsSerializer.DeserializeFromJson<Dictionary<string, List<TagViewModel>>>(importString);
+				var settings = GetJsonSettingsSerializer().DeserializeFromJson<Dictionary<string, List<TagViewModel>>>(importString);
 				if (settings is not null && settings.TryGetValue("FileTagList", out var importedTags))
 					FileTagList = importedTags;
 			}
@@ -136,7 +138,7 @@ public override bool ImportSettings(object import)
 			if (FileTagList is not null)
 			{
 				FlushSettings();
-				OnSettingImportedEvent?.Invoke(this, null);
+				OnSettingImportedEvent?.Invoke(this, EventArgs.Empty);
 				return true;
 			}
 
@@ -151,7 +153,7 @@ public override object ExportSettings()
 			};
 
 			// Serialize settings to JSON format
-			return JsonSettingsSerializer.SerializeToJson(settings);
+			return GetJsonSettingsSerializer().SerializeToJson(settings);
 		}
 
 		private int GetTagIndex(string uid)
@@ -179,5 +181,11 @@ private void UntagAllFiles(string uid)
 				}
 			}
 		}
+
+		private IJsonSettingsSerializer GetJsonSettingsSerializer()
+		{
+			return JsonSettingsSerializer
+				?? throw new InvalidOperationException("The JSON settings serializer has not been initialized.");
+		}
 	}
 }
diff --git a/src/Files.App/Services/Settings/GeneralSettingsService.cs b/src/Files.App/Services/Settings/GeneralSettingsService.cs
index c794a24f7169..e754b3c7705e 100644
--- a/src/Files.App/Services/Settings/GeneralSettingsService.cs
+++ b/src/Files.App/Services/Settings/GeneralSettingsService.cs
@@ -41,13 +41,13 @@ public bool OpenTabInExistingInstance
 			set => Set(value);
 		}
 
-		public List<string> TabsOnStartupList
+		public List<string>? TabsOnStartupList
 		{
 			get => Get<List<string>>(null);
 			set => Set(value);
 		}
 
-		public List<string> LastSessionTabList
+		public List<string>? LastSessionTabList
 		{
 			get => Get<List<string>>(null);
 			set => Set(value);
@@ -59,25 +59,25 @@ public int LastSessionSelectedTabIndex
 			set => Set(value);
 		}
 
-		public List<string> LastCrashedTabList
+		public List<string>? LastCrashedTabList
 		{
 			get => Get<List<string>>(null);
 			set => Set(value);
 		}
 
-		public List<string> PathHistoryList
+		public List<string>? PathHistoryList
 		{
 			get => Get<List<string>>(null);
 			set => Set(value);
 		}
 
-		public List<string> PreviousSearchQueriesList
+		public List<string>? PreviousSearchQueriesList
 		{
 			get => Get<List<string>>(null);
 			set => Set(value);
 		}
 
-		public List<string> PreviousArchiveExtractionLocations
+		public List<string>? PreviousArchiveExtractionLocations
 		{
 			get => Get<List<string>>(null);
 			set => Set(value);
@@ -393,7 +393,7 @@ public ArchiveWordSizes ArchiveWordSizesOption
 			set => Set((long)value);
 		}
 
-		public Dictionary<string, bool> ShowHashesDictionary
+		public Dictionary<string, bool>? ShowHashesDictionary
 		{
 			get => Get<Dictionary<string, bool>>(null);
 			set => Set(value);
diff --git a/src/Files.App/Services/Settings/UserSettingsService.cs b/src/Files.App/Services/Settings/UserSettingsService.cs
index 89c79757ee01..6ea625a4a77b 100644
--- a/src/Files.App/Services/Settings/UserSettingsService.cs
+++ b/src/Files.App/Services/Settings/UserSettingsService.cs
@@ -9,43 +9,43 @@ namespace Files.App.Services.Settings
 {
 	internal sealed class UserSettingsService : BaseJsonSettings, IUserSettingsService
 	{
-		private IGeneralSettingsService _GeneralSettingsService;
+		private IGeneralSettingsService? _GeneralSettingsService;
 		public IGeneralSettingsService GeneralSettingsService
 		{
 			get => GetSettingsService(ref _GeneralSettingsService);
 		}
 
-		private IFoldersSettingsService _FoldersSettingsService;
+		private IFoldersSettingsService? _FoldersSettingsService;
 		public IFoldersSettingsService FoldersSettingsService
 		{
 			get => GetSettingsService(ref _FoldersSettingsService);
 		}
 
-		private IAppearanceSettingsService _AppearanceSettingsService;
+		private IAppearanceSettingsService? _AppearanceSettingsService;
 		public IAppearanceSettingsService AppearanceSettingsService
 		{
 			get => GetSettingsService(ref _AppearanceSettingsService);
 		}
 
-		private IInfoPaneSettingsService _InfoPaneSettingsService;
+		private IInfoPaneSettingsService? _InfoPaneSettingsService;
 		public IInfoPaneSettingsService InfoPaneSettingsService
 		{
 			get => GetSettingsService(ref _InfoPaneSettingsService);
 		}
 
-		private ILayoutSettingsService _LayoutSettingsService;
+		private ILayoutSettingsService? _LayoutSettingsService;
 		public ILayoutSettingsService LayoutSettingsService
 		{
 			get => GetSettingsService(ref _LayoutSettingsService);
 		}
 
-		private IApplicationSettingsService _ApplicationSettingsService;
+		private IApplicationSettingsService? _ApplicationSettingsService;
 		public IApplicationSettingsService ApplicationSettingsService
 		{
 			get => GetSettingsService(ref _ApplicationSettingsService);
 		}
 
-		private IAppSettingsService _AppSettingsService;
+		private IAppSettingsService? _AppSettingsService;
 		public IAppSettingsService AppSettingsService
 		{
 			get => GetSettingsService(ref _AppSettingsService);
@@ -53,12 +53,14 @@ public IAppSettingsService AppSettingsService
 
 		public UserSettingsService()
 		{
-			SettingsSerializer = new DefaultSettingsSerializer();
+			var settingsSerializer = new DefaultSettingsSerializer();
+			SettingsSerializer = settingsSerializer;
 
 			Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.UserSettingsFileName));
 
-			JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
-			JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
+			var jsonSettingsSerializer = new DefaultJsonSettingsSerializer();
+			JsonSettingsSerializer = jsonSettingsSerializer;
+			JsonSettingsDatabase = new CachingJsonSettingsDatabase(settingsSerializer, jsonSettingsSerializer);
 		}
 
 		public override object ExportSettings()
@@ -73,7 +75,7 @@ public override object ExportSettings()
 			export.Remove(nameof(GeneralSettingsService.PreviousSearchQueriesList));
 			export.Remove(nameof(GeneralSettingsService.PreviousArchiveExtractionLocations));
 
-			return JsonSettingsSerializer.SerializeToJson(export);
+			return JsonSettingsSerializer!.SerializeToJson(export);
 		}
 
 		public override bool ImportSettings(object import)
@@ -98,10 +100,10 @@ public override bool ImportSettings(object import)
 			return false;
 		}
 
-		private TSettingsService GetSettingsService<TSettingsService>(ref TSettingsService settingsServiceMember)
+		private static TSettingsService GetSettingsService<TSettingsService>(ref TSettingsService? settingsServiceMember)
 			where TSettingsService : class, IBaseSettingsService
 		{
-			settingsServiceMember ??= Ioc.Default.GetService<TSettingsService>()!;
+			settingsServiceMember ??= Ioc.Default.GetRequiredService<TSettingsService>();
 
 			return settingsServiceMember;
 		}
diff --git a/src/Files.App/Services/SizeProvider/UserSizeProvider.cs b/src/Files.App/Services/SizeProvider/UserSizeProvider.cs
index 45cd9adecd9d..3051e920615b 100644
--- a/src/Files.App/Services/SizeProvider/UserSizeProvider.cs
+++ b/src/Files.App/Services/SizeProvider/UserSizeProvider.cs
@@ -12,7 +12,7 @@ private readonly IFoldersSettingsService folderPreferences
 
 		private ISizeProvider provider;
 
-		public event EventHandler<SizeChangedEventArgs> SizeChanged;
+		public event EventHandler<SizeChangedEventArgs>? SizeChanged;
 
 		public UserSizeProvider()
 		{
@@ -43,7 +43,7 @@ public void Dispose()
 		private ISizeProvider GetProvider()
 			=> new DrivesSizeProvider();
 
-		private async void FolderPreferences_PropertyChanged(object sender, PropertyChangedEventArgs e)
+		private async void FolderPreferences_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName is nameof(IFoldersSettingsService.CalculateFolderSizes))
 			{
@@ -54,7 +54,7 @@ private async void FolderPreferences_PropertyChanged(object sender, PropertyChan
 			}
 		}
 
-		private void Provider_SizeChanged(object sender, SizeChangedEventArgs e)
+		private void Provider_SizeChanged(object? sender, SizeChangedEventArgs e)
 			=> SizeChanged?.Invoke(this, e);
 	}
 }
diff --git a/src/Files.App/Services/Storage/IconCacheService.cs b/src/Files.App/Services/Storage/IconCacheService.cs
index c96d7a2ff697..f30401fccd17 100644
--- a/src/Files.App/Services/Storage/IconCacheService.cs
+++ b/src/Files.App/Services/Storage/IconCacheService.cs
@@ -13,7 +13,7 @@ internal sealed class IconCacheService : IIconCacheService
 
 		private readonly ConcurrentDictionary<string, byte[]?> _cache = new();
 
-		public async Task<byte[]?> GetIconAsync(string itemPath, string? extension, bool isFolder)
+		public async Task<byte[]?> GetIconAsync(string? itemPath, string? extension, bool isFolder)
 		{
 			var key = isFolder ? ":folder:" : (extension?.ToLowerInvariant() ?? ":noext:");
 
diff --git a/src/Files.App/Services/Storage/StorageArchiveService.cs b/src/Files.App/Services/Storage/StorageArchiveService.cs
index bcb5bed7e06f..7dd850de314e 100644
--- a/src/Files.App/Services/Storage/StorageArchiveService.cs
+++ b/src/Files.App/Services/Storage/StorageArchiveService.cs
@@ -289,9 +289,9 @@ await Task.Run(() =>
 
 						string entryFileName = zipEntry.Name;
 						string fullZipToPath = Path.Combine(destinationFolderPath, entryFileName);
-						string directoryName = Path.GetDirectoryName(fullZipToPath);
+						string? directoryName = Path.GetDirectoryName(fullZipToPath);
 
-						if (!Directory.Exists(directoryName))
+						if (directoryName is not null && !Directory.Exists(directoryName))
 						{
 							Directory.CreateDirectory(directoryName);
 						}
@@ -441,15 +441,18 @@ public async Task<bool> IsEncodingUndeterminedAsync(string archiveFilePath)
 		/// <inheritdoc/>
 		public async Task<SevenZipExtractor?> GetSevenZipExtractorAsync(string archiveFilePath, string password = "")
 		{
-			return await FilesystemTasks.Wrap(async () =>
+			return await FilesystemTasks.WrapNullable(async () =>
 			{
-				BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(archiveFilePath);
+				BaseStorageFile? archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(archiveFilePath);
+				if (archive is null)
+					return null;
+
 				var extractor = string.IsNullOrEmpty(password)
 					? new SevenZipExtractor(archive.Path)
 					: new SevenZipExtractor(archive.Path, password);
 
 				// Force to load archive (1665013614u)
-				return extractor?.ArchiveFileData is null ? null : extractor;
+				return extractor.ArchiveFileData is null ? null : extractor;
 			});
 		}
 	}
diff --git a/src/Files.App/Services/Storage/StorageDevicesService.cs b/src/Files.App/Services/Storage/StorageDevicesService.cs
index 2d7f967a9b1b..5f7888477517 100644
--- a/src/Files.App/Services/Storage/StorageDevicesService.cs
+++ b/src/Files.App/Services/Storage/StorageDevicesService.cs
@@ -44,10 +44,11 @@ public async IAsyncEnumerable<IFolder> GetDrivesAsync()
 					continue;
 				}
 
-				using var thumbnail = await DriveHelpers.GetThumbnailAsync(res.Result);
+				var root = res.Result!;
+				using var thumbnail = await DriveHelpers.GetThumbnailAsync(root);
 				var type = DriveHelpers.GetDriveType(drive);
 				var label = DriveHelpers.GetExtendedDriveLabel(drive);
-				var driveItem = await DriveItem.CreateFromPropertiesAsync(res.Result, drive.Name.TrimEnd('\\'), label, type, thumbnail);
+				var driveItem = await DriveItem.CreateFromPropertiesAsync(root, drive.Name.TrimEnd('\\'), label, type, thumbnail);
 
 				App.Logger.LogInformation($"Drive added: {driveItem.Path}, {driveItem.Type}");
 
@@ -72,10 +73,11 @@ public async Task UpdateDrivePropertiesAsync(IFolder drive)
 			var rootModified = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(drive.Id).AsTask());
 			if (rootModified && drive is DriveItem matchingDriveEjected)
 			{
+				var root = rootModified.Result!;
 				_ = MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 				{
-					matchingDriveEjected.Root = rootModified.Result;
-					matchingDriveEjected.Text = rootModified.Result.DisplayName;
+					matchingDriveEjected.Root = root;
+					matchingDriveEjected.Text = root.DisplayName;
 					return matchingDriveEjected.UpdatePropertiesAsync();
 				});
 			}
diff --git a/src/Files.App/Services/Storage/StorageNetworkService.cs b/src/Files.App/Services/Storage/StorageNetworkService.cs
index 1ebb9d697157..4c1181155bde 100644
--- a/src/Files.App/Services/Storage/StorageNetworkService.cs
+++ b/src/Files.App/Services/Storage/StorageNetworkService.cs
@@ -107,14 +107,15 @@ public async Task<IEnumerable<IFolder>> GetShortcutsAsync()
 					{
 						if (item is ShellLink link)
 						{
-							locations.Add(ShellFolderExtensions.GetShellLinkItem(link));
+							if (ShellFolderExtensions.GetShellLinkItem(link) is { } linkItem)
+								locations.Add(linkItem);
 						}
 						else
 						{
-							var linkPath = (string?)item?.Properties["System.Link.TargetParsingPath"];
-							if (linkPath is not null)
+							var linkPath = item.Properties["System.Link.TargetParsingPath"] as string;
+							if (linkPath is not null &&
+								ShellFolderExtensions.GetShellFileItem(item) is { } linkItem)
 							{
-								var linkItem = ShellFolderExtensions.GetShellFileItem(item);
 								locations.Add(new(linkItem) { TargetPath = linkPath });
 							}
 						}
diff --git a/src/Files.App/Services/Windows/WindowsJumpListService.cs b/src/Files.App/Services/Windows/WindowsJumpListService.cs
index 572718c619d1..635af433cb40 100644
--- a/src/Files.App/Services/Windows/WindowsJumpListService.cs
+++ b/src/Files.App/Services/Windows/WindowsJumpListService.cs
@@ -159,7 +159,7 @@ private void AddFolder(string path, string group, JumpList instance)
 						displayName = Strings.RecycleBin.GetLocalizedResource();
 					else if (path.Equals(Constants.UserEnvironmentPaths.MyComputerPath, StringComparison.OrdinalIgnoreCase))
 						displayName = Strings.ThisPC.GetLocalizedResource();
-					else if (App.LibraryManager.TryGetLibrary(path, out LibraryLocationItem library))
+					else if (App.LibraryManager.TryGetLibrary(path, out var library))
 					{
 						var libName = Path.GetFileNameWithoutExtension(library.Path);
 						displayName = libName switch
diff --git a/src/Files.App/Services/Windows/WindowsQuickAccessService.cs b/src/Files.App/Services/Windows/WindowsQuickAccessService.cs
index 86cc2008cefd..40811f8e0a6e 100644
--- a/src/Files.App/Services/Windows/WindowsQuickAccessService.cs
+++ b/src/Files.App/Services/Windows/WindowsQuickAccessService.cs
@@ -41,17 +41,25 @@ private async Task PinToSidebarAsync(string[] folderPaths, bool doUpdateQuickAcc
 
 		private async Task UnpinFromSidebarAsync(string[] folderPaths, bool doUpdateQuickAccessWidget)
 		{
-			Type? shellAppType = Type.GetTypeFromProgID("Shell.Application");
-			object? shell = Activator.CreateInstance(shellAppType);
-			dynamic? f2 = shellAppType.InvokeMember("NameSpace", System.Reflection.BindingFlags.InvokeMethod, null, shell, [$"shell:{guid}"]);
+			Type shellAppType = Type.GetTypeFromProgID("Shell.Application")
+				?? throw new InvalidOperationException("Windows Shell automation is not available.");
+
+			object shell = Activator.CreateInstance(shellAppType)
+				?? throw new InvalidOperationException("Windows Shell automation could not be created.");
+
+			dynamic f2 = shellAppType.InvokeMember("NameSpace", System.Reflection.BindingFlags.InvokeMethod, null, shell, [$"shell:{guid}"])
+				?? throw new InvalidOperationException("The Windows Shell Home namespace is not available.");
 
 			if (folderPaths.Length == 0)
 				folderPaths = (await GetPinnedFoldersAsync())
 					.Where(link => (bool?)link.Properties["System.Home.IsPinned"] ?? false)
-					.Select(link => link.FilePath).ToArray();
+					.Select(link => link.FilePath!).ToArray();
 
 			foreach (dynamic? fi in f2.Items())
 			{
+				if (fi is null)
+					throw new InvalidOperationException("The Windows Shell Home namespace returned an invalid item.");
+
 				string pathStr = (string)fi.Path;
 
 				if (ShellStorageFolder.IsShellPath(pathStr))
diff --git a/src/Files.App/Services/Windows/WindowsSecurityService.cs b/src/Files.App/Services/Windows/WindowsSecurityService.cs
index be25e9abff8b..5256ea823c4e 100644
--- a/src/Files.App/Services/Windows/WindowsSecurityService.cs
+++ b/src/Files.App/Services/Windows/WindowsSecurityService.cs
@@ -21,7 +21,7 @@ public unsafe bool CanDragAndDrop()
 		}
 
 		/// <inheritdoc/>
-		public bool IsElevationRequired(string path)
+		public bool IsElevationRequired(string? path)
 		{
 			if (string.IsNullOrEmpty(path))
 				return false;
diff --git a/src/Files.App/Services/Windows/WindowsShellService.cs b/src/Files.App/Services/Windows/WindowsShellService.cs
index b768d6b792a7..69da5b4e9755 100644
--- a/src/Files.App/Services/Windows/WindowsShellService.cs
+++ b/src/Files.App/Services/Windows/WindowsShellService.cs
@@ -6,14 +6,14 @@ namespace Files.App.Services
 	/// <inheritdoc cref="IAddItemService"/>
 	internal sealed class AddItemService : IAddItemService
 	{
-		private List<ShellNewEntry> _cached;
+		private List<ShellNewEntry>? _cached;
 
 		public async Task InitializeAsync()
 		{
 			_cached = await ShellNewEntryExtensions.GetNewContextMenuEntries();
 		}
 
-		public List<ShellNewEntry> GetEntries()
+		public List<ShellNewEntry>? GetEntries()
 		{
 			return _cached;
 		}
diff --git a/src/Files.App/UserControls/DataGridHeader.xaml.cs b/src/Files.App/UserControls/DataGridHeader.xaml.cs
index b5f2c8569519..e13d5a6c05fd 100644
--- a/src/Files.App/UserControls/DataGridHeader.xaml.cs
+++ b/src/Files.App/UserControls/DataGridHeader.xaml.cs
@@ -19,8 +19,8 @@ public sealed partial class DataGridHeader : UserControl
 		[GeneratedDependencyProperty]
 		public partial SortDirection? ColumnSortOption { get; set; }
 
-		public ICommand Command { get; set; }
-		public object CommandParameter { get; set; }
+		public ICommand? Command { get; set; }
+		public object? CommandParameter { get; set; }
 
 		partial void OnColumnSortOptionChanged(SortDirection? newValue)
 		{
diff --git a/src/Files.App/UserControls/FileIcon.xaml.cs b/src/Files.App/UserControls/FileIcon.xaml.cs
index a516c67498c1..1624c59b7957 100644
--- a/src/Files.App/UserControls/FileIcon.xaml.cs
+++ b/src/Files.App/UserControls/FileIcon.xaml.cs
@@ -11,9 +11,9 @@ namespace Files.App.UserControls
 {
 	public sealed partial class FileIcon : UserControl
 	{
-		private SelectedItemsPropertiesViewModel viewModel;
+		private SelectedItemsPropertiesViewModel? viewModel;
 
-		public SelectedItemsPropertiesViewModel ViewModel
+		public SelectedItemsPropertiesViewModel? ViewModel
 		{
 			get => viewModel;
 			set
@@ -48,7 +48,7 @@ public double ItemSize
 
 		public static readonly DependencyProperty FileIconImageSourceProperty = DependencyProperty.Register(nameof(FileIconImageSource), typeof(BitmapImage), typeof(FileIcon), null);
 
-		private BitmapImage FileIconImageSource
+		private BitmapImage? FileIconImageSource
 		{
 			get => GetValue(FileIconImageSourceProperty) as BitmapImage;
 			set => SetValue(FileIconImageSourceProperty, value);
@@ -56,7 +56,7 @@ private BitmapImage FileIconImageSource
 
 		public static readonly DependencyProperty FileIconImageDataProperty = DependencyProperty.Register(nameof(FileIconImageData), typeof(byte[]), typeof(FileIcon), null);
 
-		public byte[] FileIconImageData
+		public byte[]? FileIconImageData
 		{
 			get => GetValue(FileIconImageDataProperty) as byte[];
 			set
@@ -69,7 +69,7 @@ public byte[] FileIconImageData
 			}
 		}
 
-		private SvgImageSource CustomIconImageSource { get; set; }
+		private SvgImageSource? CustomIconImageSource { get; set; }
 
 		public FileIcon()
 		{
@@ -80,12 +80,13 @@ public async Task UpdateImageSourceAsync()
 		{
 			if (FileIconImageData is not null)
 			{
-				FileIconImageSource = new BitmapImage();
+				var imageSource = new BitmapImage();
+				FileIconImageSource = imageSource;
 				using InMemoryRandomAccessStream stream = new InMemoryRandomAccessStream();
 				await stream.WriteAsync(FileIconImageData.AsBuffer());
 				stream.Seek(0);
-				await FileIconImageSource.SetSourceAsync(stream);
+				await imageSource.SetSourceAsync(stream);
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/FilePreviews/CodePreview.xaml.cs b/src/Files.App/UserControls/FilePreviews/CodePreview.xaml.cs
index 187f787ba9d4..3e5350ed0ec4 100644
--- a/src/Files.App/UserControls/FilePreviews/CodePreview.xaml.cs
+++ b/src/Files.App/UserControls/FilePreviews/CodePreview.xaml.cs
@@ -9,8 +9,6 @@ namespace Files.App.UserControls.FilePreviews
 {
 	public sealed partial class CodePreview : UserControl
 	{
-		private RichTextBlockFormatter formatter;
-
 		private CodePreviewViewModel ViewModel { get; set; }
 
 		public CodePreview(CodePreviewViewModel model)
@@ -33,8 +31,8 @@ private void RenderDocument()
 					return;
 				}
 
-				formatter = new RichTextBlockFormatter(ActualTheme);
-				formatter.FormatRichTextBlock(ViewModel.TextValue, ViewModel.CodeLanguage, codeView);
+				var formatter = new RichTextBlockFormatter(ActualTheme);
+				formatter.FormatRichTextBlock(ViewModel.TextValue!, ViewModel.CodeLanguage!, codeView);
 			}
 		}
 
@@ -54,4 +52,4 @@ private void UserControl_ActualThemeChanged(Microsoft.UI.Xaml.FrameworkElement s
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs b/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs
index a71c7d30baa1..4818734e15a2 100644
--- a/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs
+++ b/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs
@@ -64,7 +64,7 @@ private void TogglePlaybackRequestInvoked(object? sender, EventArgs e)
 
 		private void TogglePlaybackAcceleratorInvoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
 		{
-			TogglePlaybackRequestInvoked(sender, null);
+			TogglePlaybackRequestInvoked(sender, EventArgs.Empty);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs b/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs
index 4245f9ec4d1a..a2649d4994d1 100644
--- a/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs
+++ b/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs
@@ -12,7 +12,7 @@ namespace Files.App.UserControls.Menus
 	public sealed partial class FileTagsContextMenu : MenuFlyout
 	{
 		private IFileTagsSettingsService FileTagsSettingsService { get; } =
-			Ioc.Default.GetService<IFileTagsSettingsService>();
+			Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
 		/// <summary>
 		/// Event fired when an item's tags are updated (added/removed).
diff --git a/src/Files.App/UserControls/Menus/MenuFlyoutItemWithImage.xaml.cs b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithImage.xaml.cs
index 0da88fa1d4e2..a64d184e330f 100644
--- a/src/Files.App/UserControls/Menus/MenuFlyoutItemWithImage.xaml.cs
+++ b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithImage.xaml.cs
@@ -11,9 +11,9 @@ namespace Files.App.UserControls
 {
 	public sealed partial class MenuFlyoutItemWithImage : MenuFlyoutItem
 	{
-		public BitmapImage BitmapIcon
+		public BitmapImage? BitmapIcon
 		{
-			get { return (BitmapImage)GetValue(BitmapIconProperty); }
+			get { return GetValue(BitmapIconProperty) as BitmapImage; }
 			set { SetValue(BitmapIconProperty, value); }
 		}
 
@@ -22,7 +22,8 @@ public BitmapImage BitmapIcon
 
 		private static void OnBitmapIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
 		{
-			(d as MenuFlyoutItem).Icon = e.NewValue is not null ? new IconSourceElement() : null;
+			if (d is MenuFlyoutItem item)
+				item.Icon = e.NewValue is not null ? new IconSourceElement() : null;
 		}
 
 		public MenuFlyoutItemWithImage()
@@ -30,4 +31,4 @@ public MenuFlyoutItemWithImage()
 			InitializeComponent();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/Menus/MenuFlyoutItemWithThemedIcon.xaml.cs b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithThemedIcon.xaml.cs
index 3ed25642391f..3eb9c9ddde5c 100644
--- a/src/Files.App/UserControls/Menus/MenuFlyoutItemWithThemedIcon.xaml.cs
+++ b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithThemedIcon.xaml.cs
@@ -10,9 +10,9 @@ namespace Files.App.UserControls
 {
 	public sealed partial class MenuFlyoutItemWithThemedIcon : MenuFlyoutItem
 	{
-		public Style ThemedIconStyle
+		public Style? ThemedIconStyle
 		{
-			get { return (Style)GetValue(ThemedIconStyleProperty); }
+			get { return GetValue(ThemedIconStyleProperty) as Style; }
 			set { SetValue(ThemedIconStyleProperty, value); }
 		}
 
@@ -21,7 +21,8 @@ public Style ThemedIconStyle
 
 		private static void OnThemedIconStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
 		{
-			(d as MenuFlyoutItem).Icon = e.NewValue is not null ? new IconSourceElement() : null;
+			if (d is MenuFlyoutItem item)
+				item.Icon = e.NewValue is not null ? new IconSourceElement() : null;
 		}
 
 		public MenuFlyoutItemWithThemedIcon()
@@ -29,4 +30,4 @@ public MenuFlyoutItemWithThemedIcon()
 			InitializeComponent();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/Menus/MenuFlyoutSubItemCustomProperties.cs b/src/Files.App/UserControls/Menus/MenuFlyoutSubItemCustomProperties.cs
index 261aa6367169..efd2a895e3c6 100644
--- a/src/Files.App/UserControls/Menus/MenuFlyoutSubItemCustomProperties.cs
+++ b/src/Files.App/UserControls/Menus/MenuFlyoutSubItemCustomProperties.cs
@@ -13,19 +13,20 @@ public sealed class MenuFlyoutSubItemCustomProperties : DependencyObject
 		public static readonly DependencyProperty BitmapIconProperty =
 			DependencyProperty.Register("BitmapIcon", typeof(BitmapImage), typeof(MenuFlyoutSubItemCustomProperties), new PropertyMetadata(null, OnBitmapIconChanged));
 
-		public static BitmapImage GetBitmapIcon(DependencyObject obj)
+		public static BitmapImage? GetBitmapIcon(DependencyObject obj)
 		{
-			return (BitmapImage)obj.GetValue(BitmapIconProperty);
+			return obj.GetValue(BitmapIconProperty) as BitmapImage;
 		}
 
-		public static void SetBitmapIcon(DependencyObject obj, BitmapImage value)
+		public static void SetBitmapIcon(DependencyObject obj, BitmapImage? value)
 		{
 			obj.SetValue(BitmapIconProperty, value);
 		}
 
 		private static void OnBitmapIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
 		{
-			(d as MenuFlyoutSubItem).Icon = e.NewValue is not null ? new IconSourceElement() : null;
+			if (d is MenuFlyoutSubItem item)
+				item.Icon = e.NewValue is not null ? new IconSourceElement() : null;
 		}
 	}
 }
diff --git a/src/Files.App/UserControls/Menus/ToggleMenuFlyoutItemWithThemedIcon.xaml.cs b/src/Files.App/UserControls/Menus/ToggleMenuFlyoutItemWithThemedIcon.xaml.cs
index 7718b0a32dc4..91a40c649d8b 100644
--- a/src/Files.App/UserControls/Menus/ToggleMenuFlyoutItemWithThemedIcon.xaml.cs
+++ b/src/Files.App/UserControls/Menus/ToggleMenuFlyoutItemWithThemedIcon.xaml.cs
@@ -10,9 +10,9 @@ namespace Files.App.UserControls
 {
 	public sealed partial class ToggleMenuFlyoutItemWithThemedIcon : ToggleMenuFlyoutItem
 	{
-		public Style ThemedIconStyle
+		public Style? ThemedIconStyle
 		{
-			get { return (Style)GetValue(ThemedIconStyleProperty); }
+			get { return GetValue(ThemedIconStyleProperty) as Style; }
 			set { SetValue(ThemedIconStyleProperty, value); }
 		}
 
@@ -21,7 +21,8 @@ public Style ThemedIconStyle
 
 		private static void OnThemedIconStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
 		{
-			(d as ToggleMenuFlyoutItem).Icon = e.NewValue is not null ? new IconSourceElement() : null;
+			if (d is ToggleMenuFlyoutItem item)
+				item.Icon = e.NewValue is not null ? new IconSourceElement() : null;
 		}
 
 		public ToggleMenuFlyoutItemWithThemedIcon()
@@ -29,4 +30,4 @@ public ToggleMenuFlyoutItemWithThemedIcon()
 			InitializeComponent();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index f7860994e1f0..e77ebb88828a 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -264,14 +264,14 @@
 								<controls:BreadcrumbBarItem
 									AllowDrop="True"
 									AutomationProperties.AccessibilityView="Content"
-									AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
-									ChevronToolTip="{x:Bind ChevronToolTip, Mode=OneWay}"
-									Content="{x:Bind Title, Mode=OneWay}"
+									AutomationProperties.Name="{x:Bind Title, Mode=OneTime}"
+									ChevronToolTip="{x:Bind ChevronToolTip, Mode=OneTime}"
+									Content="{x:Bind Title, Mode=OneTime}"
 									DataContext="{x:Bind}"
 									DragLeave="BreadcrumbBarItem_DragLeave"
 									DragOver="BreadcrumbBarItem_DragOver"
 									Drop="BreadcrumbBarItem_Drop"
-									IsChevronVisible="{x:Bind IsChevronVisible, Mode=OneWay}"
+									IsChevronVisible="{x:Bind IsChevronVisible, Mode=OneTime}"
 									RightTapped="BreadcrumbBarItem_RightTapped" />
 							</DataTemplate>
 						</controls:BreadcrumbBar.ItemTemplate>
@@ -279,7 +279,7 @@
 				</controls:OmnibarMode.ContentOnInactive>
 				<controls:OmnibarMode.ItemTemplate>
 					<DataTemplate x:DataType="datamodels:OmnibarPathModeSuggestionModel">
-						<TextBlock Text="{x:Bind DisplayName, Mode=OneWay}" />
+						<TextBlock Text="{x:Bind DisplayName, Mode=OneTime}" />
 					</DataTemplate>
 				</controls:OmnibarMode.ItemTemplate>
 			</controls:OmnibarMode>
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml.cs b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
index 746d31075c4e..105ecbed6204 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml.cs
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
@@ -171,13 +171,17 @@ void HistoryItemClicked(ToolbarHistoryItemModel? itemModel)
 
 		private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedEventArgs args)
 		{
+			if (ViewModel is not { } viewModel)
+				return;
+
 			var mode = Omnibar.CurrentSelectedMode;
 
 			// Path mode
 			if (mode == OmnibarPathMode)
 			{
-				await ViewModel.HandleItemNavigationAsync(args.Text);
-				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
+				await viewModel.HandleItemNavigationAsync(args.Text);
+				var pathPaneHolder = ContentPageContext.ShellPage.GetRequiredPaneHolder();
+				pathPaneHolder.FocusActivePane();
 				return;
 			}
 
@@ -197,14 +201,16 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 						continue;
 
 					await command.ExecuteAsync();
-					ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
+					var paneHolder = ContentPageContext.ShellPage.GetRequiredPaneHolder();
+					paneHolder.FocusActivePane();
 					return;
 				}
 
 				await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedResource(),
 					string.Format(Strings.InvalidCommandContent.GetLocalizedResource(), args.Text));
 
-				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
+				var commandPaneHolder = ContentPageContext.ShellPage.GetRequiredPaneHolder();
+				commandPaneHolder.FocusActivePane();
 				return;
 			}
 
@@ -214,7 +220,7 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedRes
 				var shellPage = ContentPageContext.ShellPage;
 
 				// Settings search: jump to the matching card, or apply the query in-page.
-				if (ViewModel.InstanceViewModel?.IsPageTypeSettings == true)
+				if (viewModel.InstanceViewModel.IsPageTypeSettings)
 				{
 					var settingsPage = (MainWindow.Instance.Content as FrameworkElement)?.FindDescendant<Files.App.Views.SettingsPage>();
 
@@ -227,9 +233,13 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedRes
 						settingsPage?.ApplySearchQuery(args.Text);
 					}
 
-					ViewModel.OmnibarSearchModeText = string.Empty;
+					viewModel.OmnibarSearchModeText = string.Empty;
 					Omnibar.IsFocused = false;
-					shellPage?.PaneHolder.FocusActivePane();
+					if (shellPage is not null)
+					{
+						var paneHolder = shellPage.GetRequiredPaneHolder();
+						paneHolder.FocusActivePane();
+					}
 					return;
 				}
 
@@ -242,10 +252,11 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedRes
 						: args.Text;
 
 					shellPage?.SubmitSearch(searchQuery); // use the resolved shellPage for consistency
-					ViewModel.SaveSearchQueryToList(searchQuery);
+					viewModel.SaveSearchQueryToList(searchQuery);
 				}
 
-				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
+				var searchPaneHolder = ContentPageContext.ShellPage.GetRequiredPaneHolder();
+				searchPaneHolder.FocusActivePane();
 				return;
 			}
 		}
@@ -255,40 +266,46 @@ private async void Omnibar_TextChanged(Omnibar sender, OmnibarTextChangedEventAr
 			if (args.Reason is not OmnibarTextChangeReason.UserInput)
 				return;
 
+			if (ViewModel is not { } viewModel)
+				return;
+
 			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
 			{
-				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForPathMode);
+				await DispatcherQueue.EnqueueOrInvokeAsync(viewModel.PopulateOmnibarSuggestionsForPathMode);
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 			{
-				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode);
+				await DispatcherQueue.EnqueueOrInvokeAsync(viewModel.PopulateOmnibarSuggestionsForCommandPaletteMode);
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 			{
-				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForSearchMode);
+				await DispatcherQueue.EnqueueOrInvokeAsync(viewModel.PopulateOmnibarSuggestionsForSearchMode);
 			}
 		}
 
 		private async void BreadcrumbBar_ItemClicked(Controls.BreadcrumbBar sender, Controls.BreadcrumbBarItemClickedEventArgs args)
 		{
+			var viewModel = ViewModel
+				?? throw new InvalidOperationException("The navigation toolbar does not have a view model.");
+
 			if (args.IsRootItem)
 			{
-				await ViewModel.HandleItemNavigationAsync("Home");
+				await viewModel.HandleItemNavigationAsync("Home");
 				return;
 			}
 
 			// Validate index before accessing the collection
-			if (args.Index < 0 || args.Index >= ViewModel.PathComponents.Count)
+			if (args.Index < 0 || args.Index >= viewModel.PathComponents.Count)
 				return;
 
 			// Navigation to the current folder should not happen
-			if (args.Index == ViewModel.PathComponents.Count - 1 ||
-				ViewModel.PathComponents[args.Index].Path is not { } path)
+			if (args.Index == viewModel.PathComponents.Count - 1 ||
+				viewModel.PathComponents[args.Index].Path is not { } path)
 				return;
 
 			// If user clicked the item with middle mouse button, open it in new tab
 			var openInNewTab = args.PointerRoutedEventArgs?.GetCurrentPoint(null).Properties.PointerUpdateKind is PointerUpdateKind.MiddleButtonReleased;
-			await ViewModel.HandleFolderNavigationAsync(path, openInNewTab);
+			await viewModel.HandleFolderNavigationAsync(path, openInNewTab);
 		}
 
 		private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
@@ -322,7 +339,11 @@ private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, Breadc
 					flyoutItem.Click += (sender, args) =>
 					{
 						// NOTE: We should not pass a path string but pass the storable object itself in the future.
-						contentPageContext.ShellPage!.NavigateToPath((string)flyoutItem.DataContext);
+						var path = flyoutItem.DataContext as string
+							?? throw new InvalidOperationException("The breadcrumb item does not have a navigation path.");
+						var shellPage = contentPageContext.ShellPage
+							?? throw new InvalidOperationException("There is no active shell page for breadcrumb navigation.");
+						shellPage.NavigateToPath(path);
 					};
 				}
 
@@ -350,14 +371,23 @@ private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, Breadc
 					flyoutItem.Click += (sender, args) =>
 					{
 						// NOTE: We should not pass a path string but pass the storable object itself in the future.
-						contentPageContext.ShellPage!.NavigateToPath((string)flyoutItem.DataContext);
+						var path = flyoutItem.DataContext as string
+							?? throw new InvalidOperationException("The breadcrumb item does not have a navigation path.");
+						var shellPage = contentPageContext.ShellPage
+							?? throw new InvalidOperationException("There is no active shell page for breadcrumb navigation.");
+						shellPage.NavigateToPath(path);
 					};
 				}
 
 				return;
 			}
 
-			await ViewModel.SetPathBoxDropDownFlyoutAsync(e.Flyout, ViewModel.PathComponents[e.Index]);
+			var viewModel = ViewModel
+				?? throw new InvalidOperationException("The navigation toolbar does not have a view model.");
+			if (e.Index < 0 || e.Index >= viewModel.PathComponents.Count)
+				return;
+
+			await viewModel.SetPathBoxDropDownFlyoutAsync(e.Flyout, viewModel.PathComponents[e.Index]);
 		}
 
 		private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
@@ -373,31 +403,35 @@ private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, BreadcrumbBar
 		/// </summary>
 		private async void Omnibar_ModeChanged(object sender, OmnibarModeChangedEventArgs e)
 		{
+			if (ViewModel is not { } viewModel)
+				return;
+
 			if (e.NewMode == OmnibarPathMode)
 			{
 				// Initialize with current working directory or fallback to home path
-				ViewModel.PathText = string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
+				var workingDirectory = ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory;
+				viewModel.PathText = string.IsNullOrEmpty(workingDirectory)
 					? Constants.UserEnvironmentPaths.HomePath
-					: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+					: workingDirectory;
 
-				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForPathMode);
+				await DispatcherQueue.EnqueueOrInvokeAsync(viewModel.PopulateOmnibarSuggestionsForPathMode);
 			}
 			else if (e.NewMode == OmnibarCommandPaletteMode)
 			{
 				// Clear text and load command suggestions
-				ViewModel.OmnibarCommandPaletteModeText = string.Empty;
+				viewModel.OmnibarCommandPaletteModeText = string.Empty;
 
-				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode);
+				await DispatcherQueue.EnqueueOrInvokeAsync(viewModel.PopulateOmnibarSuggestionsForCommandPaletteMode);
 			}
 			else if (e.NewMode == OmnibarSearchMode)
 			{
 				// Preserve existing search query or clear for new search
-				if (!ViewModel.InstanceViewModel.IsPageTypeSearchResults)
-					ViewModel.OmnibarSearchModeText = string.Empty;
+				if (!viewModel.InstanceViewModel.IsPageTypeSearchResults)
+					viewModel.OmnibarSearchModeText = string.Empty;
 				else
-					ViewModel.OmnibarSearchModeText = ViewModel.InstanceViewModel.CurrentSearchQuery;
+					viewModel.OmnibarSearchModeText = viewModel.InstanceViewModel.CurrentSearchQuery;
 
-				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForSearchMode);
+				await DispatcherQueue.EnqueueOrInvokeAsync(viewModel.PopulateOmnibarSuggestionsForSearchMode);
 			}
 		}
 
@@ -410,14 +444,18 @@ private async void Omnibar_IsFocusedChanged(Omnibar sender, OmnibarIsFocusedChan
 		{
 			if (args.IsFocused)
 			{
+				if (ViewModel is not { } viewModel)
+					return;
+
 				// Path Mode needs special handling when gaining focus since it has an unfocused state
 				if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
 				{
-					ViewModel.PathText = string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
+					var workingDirectory = ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory;
+					viewModel.PathText = string.IsNullOrEmpty(workingDirectory)
 						? Constants.UserEnvironmentPaths.HomePath
-						: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+						: workingDirectory;
 
-					await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForPathMode);
+					await DispatcherQueue.EnqueueOrInvokeAsync(viewModel.PopulateOmnibarSuggestionsForPathMode);
 				}
 			}
 			else
@@ -437,7 +475,8 @@ private async void Omnibar_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			if (e.Key is VirtualKey.Escape)
 			{
 				Omnibar.IsFocused = false;
-				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
+				var paneHolder = ContentPageContext.ShellPage.GetRequiredPaneHolder();
+				paneHolder.FocusActivePane();
 			}
 			else if (e.Key is VirtualKey.Tab && Omnibar.IsFocused && !InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down))
 			{
@@ -463,17 +502,23 @@ private void NavigationButtonOverflowFlyoutButton_LosingFocus(UIElement sender,
 
 		private void BreadcrumbBarItem_DragLeave(object sender, DragEventArgs e)
 		{
-			ViewModel.PathBoxItem_DragLeave(sender, e);
+			var viewModel = ViewModel
+				?? throw new InvalidOperationException("The navigation toolbar does not have a view model.");
+			viewModel.PathBoxItem_DragLeave(sender, e);
 		}
 
 		private async void BreadcrumbBarItem_DragOver(object sender, DragEventArgs e)
 		{
-			await ViewModel.PathBoxItem_DragOver(sender, e);
+			var viewModel = ViewModel
+				?? throw new InvalidOperationException("The navigation toolbar does not have a view model.");
+			await viewModel.PathBoxItem_DragOver(sender, e);
 		}
 
 		private async void BreadcrumbBarItem_Drop(object sender, DragEventArgs e)
 		{
-			await ViewModel.PathBoxItem_Drop(sender, e);
+			var viewModel = ViewModel
+				?? throw new InvalidOperationException("The navigation toolbar does not have a view model.");
+			await viewModel.PathBoxItem_Drop(sender, e);
 		}
 
 		private void BreadcrumbBarItem_RightTapped(object sender, RightTappedRoutedEventArgs e)
diff --git a/src/Files.App/UserControls/Pane/InfoPane.xaml b/src/Files.App/UserControls/Pane/InfoPane.xaml
index 9eb077d7b958..818d65db3dd3 100644
--- a/src/Files.App/UserControls/Pane/InfoPane.xaml
+++ b/src/Files.App/UserControls/Pane/InfoPane.xaml
@@ -396,7 +396,7 @@
 											Height="28"
 											Padding="12,0,12,0"
 											VerticalAlignment="Center"
-											x:Load="{x:Bind IsTag, Mode=OneWay}"
+											x:Load="{x:Bind IsTag, Mode=OneTime}"
 											AutomationProperties.Name="{x:Bind AsTag.Tag.Name, Mode=OneWay}"
 											Orientation="Horizontal"
 											Spacing="8"
@@ -425,11 +425,11 @@
 											Height="28"
 											Padding="12,0,12,0"
 											VerticalAlignment="Center"
-											x:Load="{x:Bind IsFlyout, Mode=OneWay}"
+											x:Load="{x:Bind IsFlyout, Mode=OneTime}"
 											AutomationProperties.Name="{helpers:ResourceString Name=EditTags}"
 											Background="Transparent"
 											BorderThickness="0"
-											Flyout="{x:Bind AsFlyout.Flyout, Mode=OneWay}"
+											Flyout="{x:Bind AsFlyout.Flyout, Mode=OneTime}"
 											ToolTipService.ToolTip="{helpers:ResourceString Name=EditTags}">
 											<Button.Resources>
 												<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="Transparent" />
diff --git a/src/Files.App/UserControls/Selection/RectangleSelection.cs b/src/Files.App/UserControls/Selection/RectangleSelection.cs
index a3dc27287475..265ba41a5a15 100644
--- a/src/Files.App/UserControls/Selection/RectangleSelection.cs
+++ b/src/Files.App/UserControls/Selection/RectangleSelection.cs
@@ -19,8 +19,9 @@ public class RectangleSelection
 		protected Rectangle selectionRectangle;
 		protected SelectionState selectionState;
 
-		protected RectangleSelection()
+		protected RectangleSelection(Rectangle selectionRectangle)
 		{
+			this.selectionRectangle = selectionRectangle;
 		}
 
 		/// <summary>
@@ -30,11 +31,11 @@ protected RectangleSelection()
 		/// <param name="selectionRectangle">Rectangle inside a Canvas</param>
 		/// <param name="selectionChanged">SelectionChanged event associated with uiElement</param>
 		/// <returns></returns>
-		public static RectangleSelection Create(FrameworkElement uiElement, Rectangle selectionRectangle, SelectionChangedEventHandler selectionChanged = null)
+		public static RectangleSelection Create(FrameworkElement uiElement, Rectangle selectionRectangle, SelectionChangedEventHandler? selectionChanged = null)
 		{
-			if (uiElement is ListViewBase)
+			if (uiElement is ListViewBase listView)
 			{
-				return new RectangleSelection_ListViewBase(uiElement as ListViewBase, selectionRectangle, selectionChanged);
+				return new RectangleSelection_ListViewBase(listView, selectionRectangle, selectionChanged);
 			}
 			else
 			{
@@ -44,9 +45,9 @@ public static RectangleSelection Create(FrameworkElement uiElement, Rectangle se
 
 		public delegate void SelectionStatusHandler(object sender, EventArgs e);
 
-		public event SelectionStatusHandler SelectionStarted;
+		public event SelectionStatusHandler? SelectionStarted;
 
-		public event SelectionStatusHandler SelectionEnded;
+		public event SelectionStatusHandler? SelectionEnded;
 
 		protected void OnSelectionStarted()
 		{
@@ -116,4 +117,4 @@ protected bool HasMovedMinimalDelta(double originalX, double originalY, double c
 			return deltaX > MinSelectionDelta || deltaY > MinSelectionDelta;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/Selection/RectangleSelection_ListViewBase.cs b/src/Files.App/UserControls/Selection/RectangleSelection_ListViewBase.cs
index eb64ebb415aa..1a881328c395 100644
--- a/src/Files.App/UserControls/Selection/RectangleSelection_ListViewBase.cs
+++ b/src/Files.App/UserControls/Selection/RectangleSelection_ListViewBase.cs
@@ -16,19 +16,19 @@ namespace Files.App.UserControls.Selection
 	public sealed class RectangleSelection_ListViewBase : RectangleSelection
 	{
 		private ListViewBase uiElement;
-		private ScrollViewer scrollViewer;
-		private SelectionChangedEventHandler selectionChanged;
+		private ScrollViewer? scrollViewer;
+		private SelectionChangedEventHandler? selectionChanged;
 		private DispatcherQueueTimer timer;
 		private Point originDragPoint;
 		private Dictionary<object, System.Drawing.Rectangle> itemsPosition;
-		private List<object> prevSelectedItems;
-		private List<object> prevSelectedItemsDrag;
-		private ItemSelectionStrategy selectionStrategy;
+		private List<object>? prevSelectedItems;
+		private List<object>? prevSelectedItemsDrag;
+		private ItemSelectionStrategy? selectionStrategy;
 
-		public RectangleSelection_ListViewBase(ListViewBase uiElement, Rectangle selectionRectangle, SelectionChangedEventHandler selectionChanged = null)
+		public RectangleSelection_ListViewBase(ListViewBase uiElement, Rectangle selectionRectangle, SelectionChangedEventHandler? selectionChanged = null)
+			: base(selectionRectangle)
 		{
 			this.uiElement = uiElement;
-			this.selectionRectangle = selectionRectangle;
 			this.selectionChanged = selectionChanged;
 			itemsPosition = [];
 			timer = DispatcherQueue.GetForCurrentThread().CreateTimer();
@@ -52,7 +52,7 @@ private void RectangleSelection_PointerMoved(object sender, PointerRoutedEventAr
 				}
 
 				// Clear selected items once if the pointer is pressed and moved
-				selectionStrategy.StartSelection();
+				selectionStrategy!.StartSelection();
 				OnSelectionStarted();
 				selectionState = SelectionState.Active;
 			}
@@ -71,11 +71,11 @@ private void RectangleSelection_PointerMoved(object sender, PointerRoutedEventAr
 					{
 						if (rect.IntersectsWith(item.Value))
 						{
-							selectionStrategy.HandleIntersectionWithItem(item.Key);
+							selectionStrategy!.HandleIntersectionWithItem(item.Key);
 						}
 						else
 						{
-							selectionStrategy.HandleNoIntersectionWithItem(item.Key);
+							selectionStrategy!.HandleNoIntersectionWithItem(item.Key);
 						}
 					}
 					catch (ArgumentException)
@@ -157,7 +157,7 @@ private void RectangleSelection_PointerPressed(object sender, PointerRoutedEvent
 
 		private void FetchItemsPosition()
 		{
-			var verticalOffset = scrollViewer.VerticalOffset;
+			var verticalOffset = scrollViewer!.VerticalOffset;
 			foreach (var item in uiElement.Items.ToList().Except(itemsPosition.Keys))
 			{
 				var listViewItem = (FrameworkElement)uiElement.ContainerFromItem(item); // Get ListViewItem
@@ -173,7 +173,7 @@ private void FetchItemsPosition()
 			}
 		}
 
-		private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
+		private void ScrollViewer_ViewChanged(object? sender, ScrollViewerViewChangedEventArgs e)
 		{
 			if (!timer.IsRunning)
 			{
@@ -227,7 +227,7 @@ private void RectangleSelection_SizeChanged(object sender, object e)
 			}
 		}
 
-		private void InitEvents(object sender, RoutedEventArgs e)
+		private void InitEvents(object? sender, RoutedEventArgs? e)
 		{
 			if (!uiElement.IsLoaded)
 			{
@@ -249,4 +249,4 @@ private void InitEvents(object sender, RoutedEventArgs e)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/StatusCenter/SpeedGraph.cs b/src/Files.App/UserControls/StatusCenter/SpeedGraph.cs
index 3a4dcae09190..5c0029211210 100644
--- a/src/Files.App/UserControls/StatusCenter/SpeedGraph.cs
+++ b/src/Files.App/UserControls/StatusCenter/SpeedGraph.cs
@@ -28,19 +28,19 @@ public ObservableCollection<Vector2> Points
 
 		Compositor compositor;
 
-		ContainerVisual rootVisual;
+		ContainerVisual? rootVisual;
 
-		CompositionPathGeometry graphGeometry;
-		InsetClip graphClip;
+		CompositionPathGeometry? graphGeometry;
+		InsetClip? graphClip;
 
-		SpriteVisual line;
+		SpriteVisual? line;
 
-		CompositionColorBrush backgroundBrush;
-		CompositionColorGradientStop graphFillBottom;
-		CompositionColorGradientStop graphFillTop;
-		CompositionColorBrush graphStrokeBrush;
+		CompositionColorBrush? backgroundBrush;
+		CompositionColorGradientStop? graphFillBottom;
+		CompositionColorGradientStop? graphFillTop;
+		CompositionColorBrush? graphStrokeBrush;
 
-		LinearEasingFunction linearEasing;
+		LinearEasingFunction? linearEasing;
 
 		bool initialized;
 
@@ -197,17 +197,17 @@ private void InitGraph()
 		void UpdateGraph()
 		{
 			var path = CreatePathFromPoints();
-			graphGeometry.Path = path;
+			graphGeometry!.Path = path;
 
 			using var lineAnim = compositor.CreateScalarKeyFrameAnimation();
-			lineAnim.InsertKeyFrame(1f, YValue(Points[^1].Y), linearEasing);
+			lineAnim.InsertKeyFrame(1f, YValue(Points[^1].Y), linearEasing!);
 			lineAnim.Duration = TimeSpan.FromMilliseconds(72);
-			line.StartAnimation("Offset.Y", lineAnim);
+			line!.StartAnimation("Offset.Y", lineAnim);
 
 			using var clipAnim = compositor.CreateScalarKeyFrameAnimation();
-			clipAnim.InsertKeyFrame(1f, width - (width * Points[^1].X / 100f) - 1, linearEasing);
+			clipAnim.InsertKeyFrame(1f, width - (width * Points[^1].X / 100f) - 1, linearEasing!);
 			clipAnim.Duration = TimeSpan.FromMilliseconds(72);
-			graphClip.StartAnimation("RightInset", clipAnim);
+			graphClip!.StartAnimation("RightInset", clipAnim);
 		}
 
 		CompositionPath CreatePathFromPoints()
@@ -241,12 +241,12 @@ void SetGraphColors()
 				_ => accentColor with { A = 0x7f }
 			};
 
-			backgroundBrush.Color = veryLightColor;
+			backgroundBrush!.Color = veryLightColor;
 
-			graphFillTop.Color = slightlyDarkerColor;
-			graphFillBottom.Color = veryLightColor;
+			graphFillTop!.Color = slightlyDarkerColor;
+			graphFillBottom!.Color = veryLightColor;
 
-			graphStrokeBrush.Color = accentColor;
+			graphStrokeBrush!.Color = accentColor;
 		}
 	}
 }
diff --git a/src/Files.App/UserControls/TabBar/BaseTabBar.cs b/src/Files.App/UserControls/TabBar/BaseTabBar.cs
index 7196b481592c..6e14a16ae61d 100644
--- a/src/Files.App/UserControls/TabBar/BaseTabBar.cs
+++ b/src/Files.App/UserControls/TabBar/BaseTabBar.cs
@@ -12,7 +12,7 @@ namespace Files.App.UserControls.TabBar
 	/// </summary>
 	public abstract class BaseTabBar : UserControl, ITabBar, INotifyPropertyChanged
 	{
-		protected ITabBarItemContent CurrentSelectedAppInstance;
+		protected ITabBarItemContent? CurrentSelectedAppInstance;
 
 		public static event EventHandler<ITabBar>? OnLoaded;
 		public static event PropertyChangedEventHandler? StaticPropertyChanged;
@@ -28,7 +28,7 @@ public abstract class BaseTabBar : UserControl, ITabBar, INotifyPropertyChanged
 		public ObservableCollection<TabBarItem> Items
 			=> MainPageViewModel.AppInstances;
 
-		public event EventHandler<CurrentInstanceChangedEventArgs> CurrentInstanceChanged;
+		public event EventHandler<CurrentInstanceChangedEventArgs>? CurrentInstanceChanged;
 
 		private static bool _IsRestoringClosedTab;
 		public static bool IsRestoringClosedTab
@@ -46,14 +46,14 @@ public BaseTabBar()
 			Loaded += TabView_Loaded;
 		}
 
-		public virtual DependencyObject ContainerFromItem(ITabBarItem item)
+		public virtual DependencyObject? ContainerFromItem(ITabBarItem item)
 		{
 			return null;
 		}
 
-		private void TabView_CurrentInstanceChanged(object sender, CurrentInstanceChangedEventArgs e)
+		private void TabView_CurrentInstanceChanged(object? sender, CurrentInstanceChangedEventArgs e)
 		{
-			foreach (ITabBarItemContent instance in e.PageInstances)
+			foreach (ITabBarItemContent? instance in e.PageInstances!)
 			{
 				if (instance is not null)
 				{
@@ -62,7 +62,7 @@ private void TabView_CurrentInstanceChanged(object sender, CurrentInstanceChange
 			}
 		}
 
-		protected void TabView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+		protected void TabView_SelectionChanged(object? sender, SelectionChangedEventArgs? e)
 		{
 			if (App.AppModel.TabStripSelectedIndex >= 0 && App.AppModel.TabStripSelectedIndex < Items.Count)
 			{
@@ -100,7 +100,7 @@ public void TabView_Loaded(object sender, RoutedEventArgs e)
 			OnLoaded?.Invoke(null, this);
 		}
 
-		public ITabBarItemContent GetCurrentSelectedTabInstance()
+		public ITabBarItemContent? GetCurrentSelectedTabInstance()
 		{
 			return MainPageViewModel.AppInstances[App.AppModel.TabStripSelectedIndex].TabItemContent;
 		}
@@ -116,7 +116,7 @@ public static void PushRecentTab(TabBarItemParameter[] tab)
 			StaticPropertyChanged?.Invoke(null, new PropertyChangedEventArgs(nameof(RecentlyClosedTabs)));
 		}
 
-		public List<ITabBarItemContent> GetAllTabInstances()
+		public List<ITabBarItemContent?> GetAllTabInstances()
 		{
 			return MainPageViewModel.AppInstances.Select(x => x.TabItemContent).ToList();
 		}
@@ -136,10 +136,13 @@ public async Task ReopenClosedTabAsync()
 
 		public async void MoveTabToNewWindowAsync(object sender, RoutedEventArgs e)
 		{
-			await MultitaskingTabsHelpers.MoveTabToNewWindow(((FrameworkElement)sender).DataContext as TabBarItem, this);
+			if (sender is not FrameworkElement { DataContext: TabBarItem tabItem })
+				return;
+
+			await MultitaskingTabsHelpers.MoveTabToNewWindow(tabItem, this);
 		}
 
-		public void CloseTab(TabBarItem tabItem)
+		public void CloseTab(TabBarItem? tabItem)
 		{
 			if (tabItem is null)
 				return;
@@ -148,10 +151,7 @@ public void CloseTab(TabBarItem tabItem)
 			tabItem.Unload();
 
 			// Dispose and save tab arguments
-			PushRecentTab(
-			[
-				tabItem.NavigationParameter,
-			]);
+			PushRecentTab([tabItem.NavigationParameter!]);
 
 			// Save the updated tab list
 			AppLifecycleHelper.SaveSessionTabs();
diff --git a/src/Files.App/UserControls/TabBar/ITabBar.cs b/src/Files.App/UserControls/TabBar/ITabBar.cs
index fad18875b97b..a293c53df9f3 100644
--- a/src/Files.App/UserControls/TabBar/ITabBar.cs
+++ b/src/Files.App/UserControls/TabBar/ITabBar.cs
@@ -8,17 +8,17 @@ namespace Files.App.UserControls.TabBar
 	/// </summary>
 	public interface ITabBar
 	{
-		public event EventHandler<CurrentInstanceChangedEventArgs> CurrentInstanceChanged;
+		public event EventHandler<CurrentInstanceChangedEventArgs>? CurrentInstanceChanged;
 
 		public ObservableCollection<TabBarItem> Items { get; }
 
-		public ITabBarItemContent GetCurrentSelectedTabInstance();
+		public ITabBarItemContent? GetCurrentSelectedTabInstance();
 
-		public List<ITabBarItemContent> GetAllTabInstances();
+		public List<ITabBarItemContent?> GetAllTabInstances();
 
 		public Task ReopenClosedTabAsync();
 
-		public void CloseTab(TabBarItem tabItem);
+		public void CloseTab(TabBarItem? tabItem);
 
 		public void SetLoadingIndicatorStatus(ITabBarItem item, bool loading);
 	}
diff --git a/src/Files.App/UserControls/TabBar/ITabBarItem.cs b/src/Files.App/UserControls/TabBar/ITabBarItem.cs
index e80b49f9cefa..39756ff2b2fe 100644
--- a/src/Files.App/UserControls/TabBar/ITabBarItem.cs
+++ b/src/Files.App/UserControls/TabBar/ITabBarItem.cs
@@ -10,14 +10,14 @@ namespace Files.App.UserControls.TabBar
 	/// </summary>
 	public interface ITabBarItem
 	{
-		IconSource IconSource { get; }
+		IconSource? IconSource { get; }
 
-		string Header { get; }
+		string? Header { get; }
 
-		string Description { get; }
+		string? Description { get; }
 
 		bool AllowStorageItemDrop { get; }
 
-		public TabBarItemParameter NavigationParameter { get; }
+		public TabBarItemParameter? NavigationParameter { get; }
 	}
 }
diff --git a/src/Files.App/UserControls/TabBar/ITabBarItemContent.cs b/src/Files.App/UserControls/TabBar/ITabBarItemContent.cs
index 2a9ffdad49db..45896a6ab30b 100644
--- a/src/Files.App/UserControls/TabBar/ITabBarItemContent.cs
+++ b/src/Files.App/UserControls/TabBar/ITabBarItemContent.cs
@@ -14,7 +14,7 @@ public interface ITabBarItemContent
 
 		public TabBarItemParameter? TabBarItemParameter { get; }
 
-		public event EventHandler<TabBarItemParameter> ContentChanged;
+		public event EventHandler<TabBarItemParameter>? ContentChanged;
 
 		public Task TabItemDragOver(object sender, DragEventArgs e);
 
diff --git a/src/Files.App/UserControls/TabBar/TabBar.xaml.cs b/src/Files.App/UserControls/TabBar/TabBar.xaml.cs
index b2a36829693c..6da9150e67ea 100644
--- a/src/Files.App/UserControls/TabBar/TabBar.xaml.cs
+++ b/src/Files.App/UserControls/TabBar/TabBar.xaml.cs
@@ -81,7 +81,11 @@ public TabBar()
 		private void TabView_TabItemsChanged(TabView sender, Windows.Foundation.Collections.IVectorChangedEventArgs args)
 		{
 			if (args.CollectionChange == Windows.Foundation.Collections.CollectionChange.ItemRemoved)
-				App.AppModel.TabStripSelectedIndex = Items.IndexOf(HorizontalTabView.SelectedItem as TabBarItem);
+			{
+				App.AppModel.TabStripSelectedIndex = HorizontalTabView.SelectedItem is TabBarItem selectedItem
+					? Items.IndexOf(selectedItem)
+					: -1;
+			}
 
 			if (App.AppModel.TabStripSelectedIndex >= 0 && App.AppModel.TabStripSelectedIndex < Items.Count)
 			{
@@ -102,19 +106,25 @@ private void TabView_TabItemsChanged(TabView sender, Windows.Foundation.Collecti
 
 		private async void TabViewItem_Drop(object sender, DragEventArgs e)
 		{
-			await ((sender as TabViewItem).DataContext as TabBarItem).TabItemContent.TabItemDrop(sender, e);
+			if (sender is not TabViewItem { DataContext: TabBarItem { TabItemContent: { } tabContent } })
+				return;
+
+			await tabContent.TabItemDrop(sender, e);
 			HorizontalTabView.CanReorderTabs = true;
 			tabHoverTimer.Stop();
 		}
 
 		private async void TabViewItem_DragEnter(object sender, DragEventArgs e)
 		{
-			await ((sender as TabViewItem).DataContext as TabBarItem).TabItemContent.TabItemDragOver(sender, e);
+			if (sender is not TabViewItem { DataContext: TabBarItem { TabItemContent: { } tabContent } } tabViewItem)
+				return;
+
+			await tabContent.TabItemDragOver(sender, e);
 			if (e.AcceptedOperation != DataPackageOperation.None)
 			{
 				HorizontalTabView.CanReorderTabs = false;
 				tabHoverTimer.Start();
-				hoveredTabViewItem = sender as TabViewItem;
+				hoveredTabViewItem = tabViewItem;
 			}
 		}
 
@@ -125,11 +135,11 @@ private void TabViewItem_DragLeave(object sender, DragEventArgs e)
 		}
 
 		// Select tab that is hovered over for a certain duration
-		private void TabHoverSelected(object sender, object e)
+		private void TabHoverSelected(object? sender, object e)
 		{
 			tabHoverTimer.Stop();
-			if (hoveredTabViewItem is not null)
-				App.AppModel.TabStripSelectedIndex = Items.IndexOf(hoveredTabViewItem.DataContext as TabBarItem);
+			if (hoveredTabViewItem?.DataContext is TabBarItem tabItem)
+				App.AppModel.TabStripSelectedIndex = Items.IndexOf(tabItem);
 		}
 
 		private void TabView_TabDragStarting(TabView sender, TabViewTabDragStartingEventArgs args)
@@ -137,7 +147,9 @@ private void TabView_TabDragStarting(TabView sender, TabViewTabDragStartingEvent
 			// Reset value
 			isCancelingDragOperation = false;
 
-			var tabViewItemArgs = (args.Item as TabBarItem).NavigationParameter;
+			if (args.Item is not TabBarItem { NavigationParameter: { } tabViewItemArgs } tabItem)
+				return;
+
 			args.Data.Properties.Add(TabPathIdentifier, tabViewItemArgs.Serialize());
 			args.Data.RequestedOperation = DataPackageOperation.Move;
 
@@ -150,7 +162,7 @@ private void TabView_TabDragStarting(TabView sender, TabViewTabDragStartingEvent
 			Focus(FocusState.Programmatic);
 			PreviewKeyDown += TabDragging_PreviewKeyDown;
 
-			TabDragStarted?.Invoke(this, args.Item as TabBarItem);
+			TabDragStarted?.Invoke(this, tabItem);
 		}
 
 		private void TabDragging_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
@@ -198,7 +210,7 @@ private async void TabView_TabStripDrop(object sender, DragEventArgs e)
 
 			for (int i = 0; i < tabStrip.TabItems.Count; i++)
 			{
-				var item = tabStrip.ContainerFromIndex(i) as TabViewItem;
+				var item = (tabStrip.ContainerFromIndex(i) as TabViewItem)!;
 
 				if (e.GetPosition(item).X - item.ActualWidth < 0)
 				{
@@ -207,7 +219,16 @@ private async void TabView_TabStripDrop(object sender, DragEventArgs e)
 				}
 			}
 
-			var tabViewItemArgs = TabBarItemParameter.Deserialize(tabViewItemString);
+			TabBarItemParameter tabViewItemArgs;
+			try
+			{
+				tabViewItemArgs = TabBarItemParameter.Deserialize(tabViewItemString);
+			}
+			catch (JsonException)
+			{
+				return;
+			}
+
 			ApplicationData.Current.LocalSettings.Values[TabDropHandledIdentifier] = true;
 			await NavigationHelpers.AddNewTabByParamAsync(tabViewItemArgs.InitialPageType, tabViewItemArgs.NavigationParameter, index);
 		}
@@ -247,18 +268,20 @@ private async void TabView_TabDroppedOutside(TabView sender, TabViewTabDroppedOu
 				return;
 
 			var indexOfTabViewItem = sender.TabItems.IndexOf(args.Item);
-			var tabViewItemArgs = (args.Item as TabBarItem).NavigationParameter;
+			if (args.Item is not TabBarItem { NavigationParameter: { } tabViewItemArgs } tabItem)
+				return;
+
 			var selectedTabViewItemIndex = sender.SelectedIndex;
 
-			Items.Remove(args.Item as TabBarItem);
+			Items.Remove(tabItem);
 			if (!await NavigationHelpers.OpenTabInNewWindowAsync(tabViewItemArgs.Serialize(), droppedPoint.X, droppedPoint.Y))
 			{
-				Items.Insert(indexOfTabViewItem, args.Item as TabBarItem);
+				Items.Insert(indexOfTabViewItem, tabItem);
 				sender.SelectedIndex = selectedTabViewItemIndex;
 			}
 			else
 				// Dispose tab arguments
-				(args.Item as TabBarItem)?.Unload();
+				tabItem.Unload();
 		}
 
 		private void TabView_PointerWheelChanged(object sender, PointerRoutedEventArgs e)
@@ -378,4 +401,4 @@ private async void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
 				Math.Max(0, HorizontalTabView.ActualHeight)));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/UserControls/TabBar/TabBarItem.cs b/src/Files.App/UserControls/TabBar/TabBarItem.cs
index e82897386a41..c283d9047cb0 100644
--- a/src/Files.App/UserControls/TabBar/TabBarItem.cs
+++ b/src/Files.App/UserControls/TabBar/TabBarItem.cs
@@ -13,10 +13,10 @@ public sealed partial class TabBarItem : ObservableObject, ITabBarItem, IDisposa
 	{
 		public Frame ContentFrame { get; private set; }
 
-		public event EventHandler<TabBarItemParameter> ContentChanged;
+		public event EventHandler<TabBarItemParameter>? ContentChanged;
 
-		private IconSource _IconSource;
-		public IconSource IconSource
+		private IconSource? _IconSource;
+		public IconSource? IconSource
 		{
 			get => _IconSource;
 			set => SetProperty(ref _IconSource, value);
@@ -50,8 +50,8 @@ public bool AllowStorageItemDrop
 			set => SetProperty(ref _AllowStorageItemDrop, value);
 		}
 
-		private TabBarItemParameter _NavigationArguments;
-		public TabBarItemParameter NavigationParameter
+		private TabBarItemParameter? _NavigationArguments;
+		public TabBarItemParameter? NavigationParameter
 		{
 			get => _NavigationArguments;
 			set
@@ -71,7 +71,7 @@ public TabBarItemParameter NavigationParameter
 			}
 		}
 
-		public ITabBarItemContent TabItemContent
+		public ITabBarItemContent? TabItemContent
 			=> ContentFrame?.Content as ITabBarItemContent;
 
 		public TabBarItem()
diff --git a/src/Files.App/UserControls/Toolbar.xaml.cs b/src/Files.App/UserControls/Toolbar.xaml.cs
index d20dea5b9670..f8b42a977571 100644
--- a/src/Files.App/UserControls/Toolbar.xaml.cs
+++ b/src/Files.App/UserControls/Toolbar.xaml.cs
@@ -99,8 +99,11 @@ private void AppearanceSettings_PropertyChanged(object? sender, PropertyChangedE
 
 		private async void EditTagsMenu_TagsChanged(object? sender, EventArgs e)
 		{
-			if (PageContext.ShellPage is not null)
-				await PageContext.ShellPage.ShellViewModel.RefreshTagGroups();
+			if (PageContext.ShellPage is { } shellPage)
+			{
+				var shellViewModel = shellPage.GetRequiredShellViewModel();
+				await shellViewModel.RefreshTagGroups();
+			}
 		}
 
 		private void RequestToolbarRefresh(bool ignoreDebounce)
@@ -200,18 +203,19 @@ and not ContentPageTypes.RecycleBin
 				}
 				else
 				{
-					btn.Flyout = new MenuFlyout
+					var menuFlyout = new MenuFlyout
 					{
 						Placement = group is NewItemCommandGroup or OpenWithCommandGroup
 						? FlyoutPlacementMode.BottomEdgeAlignedLeft
 						: FlyoutPlacementMode.Bottom
 					};
+					btn.Flyout = menuFlyout;
 
-					((MenuFlyout)btn.Flyout).Opening += async (s, _) =>
+					menuFlyout.Opening += async (s, _) =>
 					{
 						try
 						{
-							await PopulateGroupFlyoutAsync((MenuFlyout)s, group);
+							await PopulateGroupFlyoutAsync(menuFlyout, group);
 						}
 						catch (Exception ex)
 						{
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
index e9bba29b081f..b6e8fe566d1f 100644
--- a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -22,10 +22,10 @@ public RecentFilesWidget()
 
 		private void RecentFilesListView_ItemClick(object sender, ItemClickEventArgs e)
 		{
-			if (e.ClickedItem is not RecentItem item)
+			if (e.ClickedItem is not RecentItem { Path: { Length: > 0 } path })
 				return;
 
-			ViewModel.NavigateToPath(item.Path);
+			ViewModel.NavigateToPath(path);
 		}
 
 		private void RecentFilesListView_RightTapped(object sender, RightTappedRoutedEventArgs e)
diff --git a/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs b/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs
index 4314f96eb293..447f98c4f136 100644
--- a/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs
+++ b/src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs
@@ -7,9 +7,9 @@ namespace Files.App.Utils.Cloud
 {
 	public sealed partial class CloudDriveSyncStatusUI : ObservableObject
 	{
-		public string Glyph { get; }
+		public string? Glyph { get; }
 
-		public Style ThemedIconStyle { get; }
+		public Style? ThemedIconStyle { get; }
 
 		public CloudDriveSyncStatus SyncStatus { get; }
 
diff --git a/src/Files.App/Utils/Cloud/CloudDrivesDetector.cs b/src/Files.App/Utils/Cloud/CloudDrivesDetector.cs
index 8e296039fa6a..436f9a628e9c 100644
--- a/src/Files.App/Utils/Cloud/CloudDrivesDetector.cs
+++ b/src/Files.App/Utils/Cloud/CloudDrivesDetector.cs
@@ -10,11 +10,11 @@ namespace Files.App.Utils.Cloud
 	[SupportedOSPlatform("Windows10.0.10240")]
 	public sealed class CloudDrivesDetector
 	{
-		private readonly static string programFilesFolder = Environment.GetEnvironmentVariable("ProgramFiles");
+		private readonly static string? programFilesFolder = Environment.GetEnvironmentVariable("ProgramFiles");
 
 		public static async Task<IEnumerable<ICloudProvider>> DetectCloudDrives()
 		{
-			var tasks = new Task<IEnumerable<ICloudProvider>>[]
+			var tasks = new Task<IEnumerable<ICloudProvider>?>[]
 			{
 				SafetyExtensions.IgnoreExceptions(DetectOneDrive, App.Logger),
 				SafetyExtensions.IgnoreExceptions(DetectSharepoint, App.Logger),
@@ -26,11 +26,11 @@ public static async Task<IEnumerable<ICloudProvider>> DetectCloudDrives()
 				SafetyExtensions.IgnoreExceptions(DetectAutodeskDrive, App.Logger),
 			};
 
-			await Task.WhenAll(tasks);
+			var results = await Task.WhenAll(tasks);
 
-			return tasks
-				.Where(o => o.Result is not null)
-				.SelectMany(o => o.Result)
+			return results
+				.WhereNotNull()
+				.SelectMany(providers => providers)
 				.OrderBy(o => o.ID.ToString())
 				.ThenBy(o => o.Name)
 				.Distinct();
@@ -132,7 +132,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 			return Task.FromResult<IEnumerable<ICloudProvider>>(results);
 		}
 
-		private static byte[]? GetIconData(string iconPath)
+		private static byte[]? GetIconData(string? iconPath)
 		{
 			if (string.IsNullOrEmpty(iconPath) || !File.Exists(iconPath))
 				return null;
@@ -143,12 +143,12 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 			return File.ReadAllBytes(iconPath);
 		}
 
-		private static Task<IEnumerable<ICloudProvider>> DetectOneDrive()
+		private static Task<IEnumerable<ICloudProvider>?> DetectOneDrive()
 		{
 			using var oneDriveAccountsKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\OneDrive\Accounts");
 			if (oneDriveAccountsKey is null)
 			{
-				return Task.FromResult<IEnumerable<ICloudProvider>>(null);
+				return Task.FromResult<IEnumerable<ICloudProvider>?>(null);
 			}
 
 			var oneDriveAccounts = new List<ICloudProvider>();
@@ -170,15 +170,15 @@ private static Task<IEnumerable<ICloudProvider>> DetectOneDrive()
 				}
 			}
 
-			return Task.FromResult<IEnumerable<ICloudProvider>>(oneDriveAccounts);
+			return Task.FromResult<IEnumerable<ICloudProvider>?>(oneDriveAccounts);
 		}
 
-		private static Task<IEnumerable<ICloudProvider>> DetectSharepoint()
+		private static Task<IEnumerable<ICloudProvider>?> DetectSharepoint()
 		{
 			using var oneDriveAccountsKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\OneDrive\Accounts");
 			if (oneDriveAccountsKey is null)
 			{
-				return Task.FromResult<IEnumerable<ICloudProvider>>(null);
+				return Task.FromResult<IEnumerable<ICloudProvider>?>(null);
 			}
 
 			var sharepointAccounts = new List<ICloudProvider>();
@@ -227,7 +227,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectSharepoint()
 				}
 			}
 
-			return Task.FromResult<IEnumerable<ICloudProvider>>(sharepointAccounts);
+			return Task.FromResult<IEnumerable<ICloudProvider>?>(sharepointAccounts);
 		}
 
 		private static Task<IEnumerable<ICloudProvider>> DetectpCloudDrive()
@@ -238,7 +238,8 @@ private static Task<IEnumerable<ICloudProvider>> DetectpCloudDrive()
 			var syncedFolder = (string?)pCloudDriveKey?.GetValue("SyncDrive");
 			if (syncedFolder is not null)
 			{
-				string iconPath = Path.Combine(programFilesFolder, "pCloud Drive", "pCloud.exe");
+				string iconPath = Path.Combine(programFilesFolder
+					?? throw new InvalidOperationException("The ProgramFiles environment variable is not set."), "pCloud Drive", "pCloud.exe");
 				var iconFile = Win32Helper.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 32512 }, 32).FirstOrDefault();
 
 				App.AppModel.PCloudDrivePath = syncedFolder;
@@ -261,7 +262,8 @@ private static Task<IEnumerable<ICloudProvider>> DetectNutstoreDrive()
 
 			if (NutstoreKey is not null)
 			{
-				string iconPath = Path.Combine(programFilesFolder, "Nutstore", "Nutstore.exe");
+				string iconPath = Path.Combine(programFilesFolder
+					?? throw new InvalidOperationException("The ProgramFiles environment variable is not set."), "Nutstore", "Nutstore.exe");
 				var iconFile = Win32Helper.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 101 }).FirstOrDefault();
 
 				using var syncRootMangerKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SyncRootManager");
@@ -298,7 +300,8 @@ private static Task<IEnumerable<ICloudProvider>> DetectSeadriveDrive()
 			var syncFolder = (string?)SeadriveKey?.GetValue("seadriveRoot");
 			if (SeadriveKey is not null)
 			{
-				string iconPath = Path.Combine(programFilesFolder, "SeaDrive", "bin", "seadrive.exe");
+				string iconPath = Path.Combine(programFilesFolder
+					?? throw new InvalidOperationException("The ProgramFiles environment variable is not set."), "SeaDrive", "bin", "seadrive.exe");
 				var iconFile = Win32Helper.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 101 }).FirstOrDefault();
 
 				results.Add(new CloudProvider(CloudProviders.Seadrive)
@@ -319,7 +322,8 @@ private static Task<IEnumerable<ICloudProvider>> DetectAutodeskDrive()
 
 			if (AutodeskKey is not null)
 			{
-				string iconPath = Path.Combine(programFilesFolder, "Autodesk", "Desktop Connector", "DesktopConnector.Applications.Tray.exe");
+				string iconPath = Path.Combine(programFilesFolder
+					?? throw new InvalidOperationException("The ProgramFiles environment variable is not set."), "Autodesk", "Desktop Connector", "DesktopConnector.Applications.Tray.exe");
 				var iconFile = Win32Helper.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 32512 }).FirstOrDefault();
 				var mainFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "DC");
 				var autodeskFolders = Directory.GetDirectories(mainFolder, "", SearchOption.AllDirectories);
diff --git a/src/Files.App/Utils/Cloud/CloudDrivesManager.cs b/src/Files.App/Utils/Cloud/CloudDrivesManager.cs
index 8e845dd50ed8..fda5f641716d 100644
--- a/src/Files.App/Utils/Cloud/CloudDrivesManager.cs
+++ b/src/Files.App/Utils/Cloud/CloudDrivesManager.cs
@@ -12,7 +12,7 @@ public static class CloudDrivesManager
 	{
 		private static readonly ILogger _logger = Ioc.Default.GetRequiredService<ILogger<App>>();
 		private static readonly ICloudDetector _detector = Ioc.Default.GetRequiredService<ICloudDetector>();
-		public static EventHandler<NotifyCollectionChangedEventArgs> DataChanged;
+		public static EventHandler<NotifyCollectionChangedEventArgs>? DataChanged;
 		private static readonly List<DriveItem> _Drives = [];
 
 		public static IReadOnlyList<DriveItem> Drives
@@ -116,4 +116,4 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async ()
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Cloud/CloudProvider.cs b/src/Files.App/Utils/Cloud/CloudProvider.cs
index b827bd596243..db26c8c7f62c 100644
--- a/src/Files.App/Utils/Cloud/CloudProvider.cs
+++ b/src/Files.App/Utils/Cloud/CloudProvider.cs
@@ -7,9 +7,9 @@ public sealed class CloudProvider : ICloudProvider
 	{
 		public CloudProviders ID { get; }
 
-		public string Name { get; init; } = string.Empty;
+		public string? Name { get; init; } = string.Empty;
 
-		public string SyncFolder { get; init; } = string.Empty;
+		public string? SyncFolder { get; init; } = string.Empty;
 
 		public byte[]? IconData { get; init; }
 
diff --git a/src/Files.App/Utils/Cloud/Detector/BoxCloudDetector.cs b/src/Files.App/Utils/Cloud/Detector/BoxCloudDetector.cs
index 42b7104290ac..11d4a0411588 100644
--- a/src/Files.App/Utils/Cloud/Detector/BoxCloudDetector.cs
+++ b/src/Files.App/Utils/Cloud/Detector/BoxCloudDetector.cs
@@ -17,9 +17,14 @@ protected override async IAsyncEnumerable<ICloudProvider> GetProviders()
 
 			string configPathBoxSync = Path.Combine(UserDataPaths.GetDefault().LocalAppData, @"Box Sync\sync_root_folder.txt");
 
-			StorageFile configFile = await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(configPathBoxDrive).AsTask());
+			var configFileResult = await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(configPathBoxDrive).AsTask());
+			var configFile = configFileResult.Result;
 
-			configFile ??= await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(configPathBoxSync).AsTask());
+			if (configFile is null)
+			{
+				configFileResult = await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(configPathBoxSync).AsTask());
+				configFile = configFileResult.Result;
+			}
 
 			if (configFile is not null)
 			{
diff --git a/src/Files.App/Utils/Cloud/Detector/DropBoxCloudDetector.cs b/src/Files.App/Utils/Cloud/Detector/DropBoxCloudDetector.cs
index 5905b16eaec1..b1ab7485918e 100644
--- a/src/Files.App/Utils/Cloud/Detector/DropBoxCloudDetector.cs
+++ b/src/Files.App/Utils/Cloud/Detector/DropBoxCloudDetector.cs
@@ -74,24 +74,26 @@ private async IAsyncEnumerable<ICloudProvider> ParseInfoJson(string jsonPath)
 
 			if (jsonElem.TryGetProperty("personal", out JsonElement inner))
 			{
-				string dropBoxPath = inner.GetProperty("path").GetString();
-
-				yield return new CloudProvider(CloudProviders.DropBox)
+				if (inner.GetProperty("path").GetString() is { Length: > 0 } dropBoxPath)
 				{
-					Name = "Dropbox",
-					SyncFolder = dropBoxPath,
-				};
+					yield return new CloudProvider(CloudProviders.DropBox)
+					{
+						Name = "Dropbox",
+						SyncFolder = dropBoxPath,
+					};
+				}
 			}
 
 			if (jsonElem.TryGetProperty("business", out JsonElement innerBusiness))
 			{
-				string dropBoxPath = innerBusiness.GetProperty("path").GetString();
-
-				yield return new CloudProvider(CloudProviders.DropBox)
+				if (innerBusiness.GetProperty("path").GetString() is { Length: > 0 } dropBoxPath)
 				{
-					Name = "Dropbox Business",
-					SyncFolder = dropBoxPath,
-				};
+					yield return new CloudProvider(CloudProviders.DropBox)
+					{
+						Name = "Dropbox Business",
+						SyncFolder = dropBoxPath,
+					};
+				}
 			}
 		}
 	}
diff --git a/src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs b/src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs
index 502a4c4a1fa7..a73d33161534 100644
--- a/src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs
+++ b/src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs
@@ -70,7 +70,7 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
 					continue;
 				}
 
-				var folder = folderResult.Result;
+				var folder = folderResult.Result!;
 				string title = reader["title"]?.ToString() ?? folder.Name;
 
 				Debug.WriteLine("YIELD RETURNING from `GoogleDriveCloudDetector.GetProviders()` (roots): ");
@@ -103,7 +103,7 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
 					continue;
 				}
 
-				var folder = folderResult.Result;
+				var folder = folderResult.Result!;
 				string title = reader["name"]?.ToString() ?? folder.Name;
 
 				Debug.WriteLine("YIELD RETURNING from `GoogleDriveCloudDetector.GetProviders` (media): ");
diff --git a/src/Files.App/Utils/Cloud/Detector/SynologyDriveCloudDetector.cs b/src/Files.App/Utils/Cloud/Detector/SynologyDriveCloudDetector.cs
index df75d90a789f..52965f99efd2 100644
--- a/src/Files.App/Utils/Cloud/Detector/SynologyDriveCloudDetector.cs
+++ b/src/Files.App/Utils/Cloud/Detector/SynologyDriveCloudDetector.cs
@@ -38,7 +38,7 @@ protected override async IAsyncEnumerable<ICloudProvider> GetProviders()
 
 			// Open the connection and execute the command
 			database.Open();
-			var connections = new Dictionary<string, (string ConnectionType, string HostName)>();
+			var connections = new Dictionary<string, (string? ConnectionType, string? HostName)>();
 
 			var reader = cmdConnection.ExecuteReader();
 			while (reader.Read())
@@ -49,14 +49,15 @@ protected override async IAsyncEnumerable<ICloudProvider> GetProviders()
 					HostName: reader["host_name"]?.ToString()
 				);
 
-				connections.Add(reader["id"]?.ToString(), connection);
+				connections.Add(reader["id"]?.ToString()!, connection);
 			}
 
 			reader = cmdTable.ExecuteReader();
 			while (reader.Read())
 			{
 				// Extract the data from the reader
-				if (connections[reader["conn_id"]?.ToString()].ConnectionType is "1")
+				var connectionId = reader["conn_id"]?.ToString()!;
+				if (connections[connectionId].ConnectionType is "1")
 				{
 					string? path = reader["sync_folder"]?.ToString();
 
@@ -68,7 +69,7 @@ protected override async IAsyncEnumerable<ICloudProvider> GetProviders()
 					yield return new CloudProvider(CloudProviders.SynologyDrive)
 					{
 						SyncFolder = path,
-						Name = $"Synology Drive - {connections[reader["conn_id"]?.ToString()].HostName} ({folder.Name})",
+						Name = $"Synology Drive - {connections[connectionId].HostName} ({folder.Name})",
 					};
 				}
 			}
diff --git a/src/Files.App/Utils/Cloud/ICloudProvider.cs b/src/Files.App/Utils/Cloud/ICloudProvider.cs
index bfff8f15468d..142a55f7338a 100644
--- a/src/Files.App/Utils/Cloud/ICloudProvider.cs
+++ b/src/Files.App/Utils/Cloud/ICloudProvider.cs
@@ -7,9 +7,9 @@ public interface ICloudProvider : IEquatable<ICloudProvider>
 	{
 		public CloudProviders ID { get; }
 
-		public string Name { get; }
+		public string? Name { get; }
 
-		public string SyncFolder { get; }
+		public string? SyncFolder { get; }
 
 		public byte[]? IconData { get; }
 	}
diff --git a/src/Files.App/Utils/CommandLine/CommandLineParser.cs b/src/Files.App/Utils/CommandLine/CommandLineParser.cs
index 77164b60e829..e8972f6e1c51 100644
--- a/src/Files.App/Utils/CommandLine/CommandLineParser.cs
+++ b/src/Files.App/Utils/CommandLine/CommandLineParser.cs
@@ -129,7 +129,7 @@ public static string[] SplitArguments(string commandLine, bool trimQuotes = fals
 		/// </summary>
 		/// <param name="args"></param>
 		/// <returns></returns>
-		public static List<KeyValuePair<string, string[]>> Parse(string[] args = null)
+		public static List<KeyValuePair<string, string[]>> Parse(string[]? args = null)
 		{
 			var parsedArgs = new List<KeyValuePair<string, string[]>>();
 
@@ -163,8 +163,12 @@ public static List<KeyValuePair<string, string[]>> Parse(string[] args = null)
 				}
 			}
 
-			if (parsedArgs.Count == 0 && args.Length >= 2)
-				parsedArgs.Add(new KeyValuePair<string, string[]>("Cmdless", [string.Join(' ', args.Skip(1)).TrimStart()]));
+			if (parsedArgs.Count == 0)
+			{
+				ArgumentNullException.ThrowIfNull(args);
+				if (args.Length >= 2)
+					parsedArgs.Add(new KeyValuePair<string, string[]>("Cmdless", [string.Join(' ', args.Skip(1)).TrimStart()]));
+			}
 
 			return parsedArgs;
 		}
diff --git a/src/Files.App/Utils/FileTags/FileTagsHelper.cs b/src/Files.App/Utils/FileTags/FileTagsHelper.cs
index 7e95c07c77d5..2fd834672f60 100644
--- a/src/Files.App/Utils/FileTags/FileTagsHelper.cs
+++ b/src/Files.App/Utils/FileTags/FileTagsHelper.cs
@@ -136,7 +136,7 @@ public static async Task<bool> RemoveTagsAsync(IEnumerable<ListedItem> items)
 
 		public static ulong? GetFileFRN(string filePath) => Win32Helper.GetFileFRN(filePath);
 
-		public static Task<ulong?> GetFileFRN(IStorageItem item)
+		public static Task<ulong?> GetFileFRN(IStorageItem? item)
 		{
 			return item switch
 			{
@@ -152,4 +152,4 @@ public static async Task<bool> RemoveTagsAsync(IEnumerable<ListedItem> items)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/FileTags/FileTagsManager.cs b/src/Files.App/Utils/FileTags/FileTagsManager.cs
index 284dedd09e1d..7458330e5a37 100644
--- a/src/Files.App/Utils/FileTags/FileTagsManager.cs
+++ b/src/Files.App/Utils/FileTags/FileTagsManager.cs
@@ -9,9 +9,9 @@ namespace Files.App.Utils.FileTags
 	public sealed class FileTagsManager
 	{
 		private readonly ILogger logger = Ioc.Default.GetRequiredService<ILogger<App>>();
-		private readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetService<IFileTagsSettingsService>();
+		private readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
-		public EventHandler<NotifyCollectionChangedEventArgs> DataChanged;
+		public EventHandler<NotifyCollectionChangedEventArgs>? DataChanged;
 
 		private readonly List<FileTagItem> fileTags = [];
 		public IReadOnlyList<FileTagItem> FileTags
diff --git a/src/Files.App/Utils/Git/GitHelpers.cs b/src/Files.App/Utils/Git/GitHelpers.cs
index f6eb2a1ca182..2bcc3f8a5317 100644
--- a/src/Files.App/Utils/Git/GitHelpers.cs
+++ b/src/Files.App/Utils/Git/GitHelpers.cs
@@ -6,6 +6,7 @@
 using LibGit2Sharp;
 using Microsoft.Extensions.Logging;
 using Sentry;
+using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Text;
@@ -19,7 +20,7 @@ internal static partial class GitHelpers
 		private static LibGit2Service _implementation = Ioc.Default.GetRequiredService<LibGit2Service>(); // TODO: Replace with IVersionControl abstraction when it is complete
 
 		/// <inheritdoc cref="IVersionControlService.GetGitRepositoryPath(string?,string)"/>
-		public static string? GetGitRepositoryPath(string? path, string root) => _implementation.GetGitRepositoryPath(path, root);
+		public static string? GetGitRepositoryPath(string? path, string? root) => _implementation.GetGitRepositoryPath(path, root);
 
 		/// <inheritdoc cref="IVersionControlService.GetOriginRepositoryName(string?)"/>
 		public static string GetOriginRepositoryName(string? path) => _implementation.GetOriginRepositoryName(path);
@@ -358,7 +359,7 @@ public static async Task RequireGitAuthenticationAsync()
 			await loginDialogTask;
 		}
 
-		public static bool IsRepositoryEx(string path, out string repoRootPath)
+		public static bool IsRepositoryEx([NotNullWhen(true)] string? path, [NotNullWhen(true)] out string? repoRootPath)
 		{
 			repoRootPath = path;
 
@@ -668,4 +669,4 @@ public static async Task CloneRepoAsync(string repoUrl, string repoName, string
 
 		#endregion
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Global/WSLDistroManager.cs b/src/Files.App/Utils/Global/WSLDistroManager.cs
index 6c8d28332476..cfa9f7957db6 100644
--- a/src/Files.App/Utils/Global/WSLDistroManager.cs
+++ b/src/Files.App/Utils/Global/WSLDistroManager.cs
@@ -10,7 +10,7 @@ namespace Files.App.Utils
 {
 	public static class WSLDistroManager
 	{
-		public static EventHandler<NotifyCollectionChangedEventArgs> DataChanged;
+		public static EventHandler<NotifyCollectionChangedEventArgs>? DataChanged;
 
 		private static readonly List<WslDistroItem> distros = [];
 		public static IReadOnlyList<WslDistroItem> Distros
@@ -69,7 +69,7 @@ public static async Task UpdateDrivesAsync()
 		public static bool TryGetDistro(string path, [NotNullWhen(true)] out WslDistroItem? distro)
 		{
 			var normalizedPath = PathNormalization.NormalizePath(path);
-			distro = Distros.FirstOrDefault(x => normalizedPath.StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.OrdinalIgnoreCase));
+			distro = Distros.FirstOrDefault(x => normalizedPath.StartsWith(PathNormalization.NormalizePath(x.Path!), StringComparison.OrdinalIgnoreCase));
 
 			return distro is not null;
 		}
@@ -98,4 +98,4 @@ static bool Contains(string displayName, string distroName)
 				=> displayName.Contains(distroName, StringComparison.OrdinalIgnoreCase);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs b/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs
index a74720b50bc8..c8657eaa1a59 100644
--- a/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs
+++ b/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs
@@ -12,10 +12,10 @@ namespace Files.App.Utils
 {
 	public sealed class WindowsStorageDeviceWatcher : IStorageDeviceWatcher
 	{
-		public event EventHandler<IFolder> DeviceAdded;
-		public event EventHandler<string> DeviceRemoved;
-		public event EventHandler EnumerationCompleted;
-		public event EventHandler<string> DeviceModified;
+		public event EventHandler<IFolder>? DeviceAdded;
+		public event EventHandler<string>? DeviceRemoved;
+		public event EventHandler? EnumerationCompleted;
+		public event EventHandler<string>? DeviceModified;
 
 		private DeviceWatcher watcher;
 
@@ -55,10 +55,10 @@ private async void Win32_OnDeviceAdded(object? sender, DeviceEventArgs e)
 			if (!driveAdded.IsReady && !IsUnauthorizedDrive(driveAdded))
 				return;
 
-			var rootAdded = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(e.DeviceId).AsTask());
-			if (!rootAdded)
+			var rootResult = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(e.DeviceId).AsTask());
+			if (rootResult.Result is not { } rootAdded)
 			{
-				App.Logger.LogWarning($"{rootAdded.ErrorCode}: Attempting to add the device, {e.DeviceId},"
+				App.Logger.LogWarning($"{rootResult.ErrorCode}: Attempting to add the device, {e.DeviceId},"
 					+ " failed at the StorageFolder initialization step. This device will be ignored.");
 				return;
 			}
diff --git a/src/Files.App/Utils/Library/LibraryManager.cs b/src/Files.App/Utils/Library/LibraryManager.cs
index 3ca4461ec356..4d1302fe6fc3 100644
--- a/src/Files.App/Utils/Library/LibraryManager.cs
+++ b/src/Files.App/Utils/Library/LibraryManager.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections.Specialized;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
@@ -17,7 +18,7 @@ public sealed partial class LibraryManager : IDisposable
 	{
 		public EventHandler<NotifyCollectionChangedEventArgs>? DataChanged;
 
-		private FileSystemWatcher librariesWatcher;
+		private FileSystemWatcher? librariesWatcher;
 		private readonly List<LibraryLocationItem> libraries = [];
 		private static readonly Lazy<LibraryManager> lazy = new(() => new LibraryManager());
 
@@ -76,11 +77,11 @@ public static async Task<List<LibraryLocationItem>> ListUserLibraries()
 					var libFiles = Directory.EnumerateFiles(ShellLibraryItem.LibrariesPath, "*" + ShellLibraryItem.EXTENSION);
 					foreach (var libFile in libFiles)
 					{
-						using var shellItem = new ShellLibraryEx(Shell32.ShellUtil.GetShellItemForPath(libFile), true);
-						if (shellItem is ShellLibraryEx library)
-						{
-							libraryItems.Add(ShellFolderExtensions.GetShellLibraryItem(library, libFile));
-						}
+						if (Shell32.ShellUtil.GetShellItemForPath(libFile) is not { } libraryItem)
+							continue;
+
+						using var library = new ShellLibraryEx(libraryItem, true);
+						libraryItems.Add(ShellFolderExtensions.GetShellLibraryItem(library, libFile));
 					}
 					return libraryItems;
 				}
@@ -113,7 +114,7 @@ public async Task UpdateLibrariesAsync()
 			DataChanged?.Invoke(SectionType.Library, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 		}
 
-		public bool TryGetLibrary(string path, out LibraryLocationItem library)
+		public bool TryGetLibrary(string? path, [NotNullWhen(true)] out LibraryLocationItem? library)
 		{
 			if (string.IsNullOrWhiteSpace(path) || !path.EndsWith(ShellLibraryItem.EXTENSION, StringComparison.OrdinalIgnoreCase))
 			{
@@ -134,7 +135,7 @@ public async Task<bool> CreateNewLibrary(string name)
 			if (string.IsNullOrWhiteSpace(name) || !CanCreateLibrary(name).result)
 				return false;
 
-			var newLib = new LibraryLocationItem(await STATask.Run(() =>
+			var shellLibrary = await STATask.Run(() =>
 			{
 				try
 				{
@@ -142,26 +143,29 @@ public async Task<bool> CreateNewLibrary(string name)
 					library.Folders.Add(ShellItem.Open(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))); // Add default folder so it's not empty
 					library.Commit();
 					library.Reload();
-					return Task.FromResult(ShellFolderExtensions.GetShellLibraryItem(library, library.GetDisplayName(ShellItemDisplayString.DesktopAbsoluteParsing)));
+					var libraryPath = library.GetDisplayName(ShellItemDisplayString.DesktopAbsoluteParsing);
+					return Task.FromResult(libraryPath is null
+						? null
+						: ShellFolderExtensions.GetShellLibraryItem(library, libraryPath));
 				}
 				catch (Exception e)
 				{
 					App.Logger.LogWarning(e, null);
 				}
 
-				return Task.FromResult<ShellLibraryItem>(null);
-			}, App.Logger));
+				return Task.FromResult<ShellLibraryItem?>(null);
+			}, App.Logger);
 
-			if (newLib is not null)
+			if (shellLibrary is null)
+				return false;
+
+			var newLib = new LibraryLocationItem(shellLibrary);
+			lock (libraries)
 			{
-				lock (libraries)
-				{
-					libraries.Add(newLib);
-				}
-				DataChanged?.Invoke(SectionType.Library, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, newLib));
-				return true;
+				libraries.Add(newLib);
 			}
-			return false;
+			DataChanged?.Invoke(SectionType.Library, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, newLib));
+			return true;
 		}
 
 		/// <summary>
@@ -172,7 +176,7 @@ public async Task<bool> CreateNewLibrary(string name)
 		/// <param name="folders">Update the library folders or null to keep current</param>
 		/// <param name="isPinned">Update the library pinned status or null to keep current</param>
 		/// <returns>The new library if successfully updated</returns>
-		public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string defaultSaveFolder = null, string[] folders = null, bool? isPinned = null)
+		public async Task<LibraryLocationItem?> UpdateLibrary(string libraryPath, string? defaultSaveFolder = null, string[]? folders = null, bool? isPinned = null)
 		{
 			if (string.IsNullOrWhiteSpace(libraryPath) || (defaultSaveFolder is null && folders is null && isPinned is null))
 				// Nothing to update
@@ -183,7 +187,10 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string
 				try
 				{
 					bool updated = false;
-					using var library = new ShellLibraryEx(Shell32.ShellUtil.GetShellItemForPath(libraryPath), false);
+					if (Shell32.ShellUtil.GetShellItemForPath(libraryPath) is not { } libraryItem)
+						return Task.FromResult<ShellLibraryItem?>(null);
+
+					using var library = new ShellLibraryEx(libraryItem, false);
 					if (folders is not null)
 					{
 						if (folders.Length > 0)
@@ -222,7 +229,7 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string
 					{
 						library.Commit();
 						library.Reload(); // Reload folders list
-						return Task.FromResult(ShellFolderExtensions.GetShellLibraryItem(library, libraryPath));
+						return Task.FromResult<ShellLibraryItem?>(ShellFolderExtensions.GetShellLibraryItem(library, libraryPath));
 					}
 				}
 				catch (Exception e)
@@ -230,7 +237,7 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string
 					App.Logger.LogWarning(e, null);
 				}
 
-				return Task.FromResult<ShellLibraryItem>(null);
+				return Task.FromResult<ShellLibraryItem?>(null);
 			}, App.Logger);
 
 			var newLib = item is not null ? new LibraryLocationItem(item) : null;
@@ -285,12 +292,12 @@ public static async Task ShowRestoreDefaultLibrariesDialogAsync()
 					await ContextMenu.InvokeVerb("restorelibraries", ShellLibraryItem.LibrariesPath);
 					await App.LibraryManager.UpdateLibrariesAsync();
 				},
-				CloseButtonAction = (vm, e) => vm.HideDialog(),
+				CloseButtonAction = (vm, e) => vm.Hide(),
 				KeyDownAction = (vm, e) =>
 				{
 					if (e.Key == VirtualKey.Escape)
 					{
-						vm.HideDialog();
+						vm.Hide();
 					}
 				},
 				DynamicButtons = DynamicDialogButtons.Primary | DynamicDialogButtons.Cancel
@@ -345,7 +352,7 @@ public static async Task ShowCreateNewLibraryDialogAsync()
 				},
 				CloseButtonAction = (vm, e) =>
 				{
-					vm.HideDialog();
+					vm.Hide();
 				},
 				KeyDownAction = async (vm, e) =>
 				{
@@ -355,7 +362,7 @@ public static async Task ShowCreateNewLibraryDialogAsync()
 					}
 					else if (e.Key == VirtualKey.Escape)
 					{
-						vm.HideDialog();
+						vm.Hide();
 					}
 				},
 				DynamicButtons = DynamicDialogButtons.Primary | DynamicDialogButtons.Cancel
@@ -363,7 +370,7 @@ public static async Task ShowCreateNewLibraryDialogAsync()
 			await dialog.ShowAsync();
 		}
 
-		private void OnLibraryChanged(WatcherChangeTypes changeType, string oldPath, string newPath)
+		private void OnLibraryChanged(WatcherChangeTypes changeType, string? oldPath, string? newPath)
 		{
 			if (newPath is not null && (!newPath.ToLowerInvariant().EndsWith(ShellLibraryItem.EXTENSION, StringComparison.Ordinal) || !File.Exists(newPath)))
 			{
@@ -375,7 +382,14 @@ private void OnLibraryChanged(WatcherChangeTypes changeType, string oldPath, str
 
 			if (!changeType.HasFlag(WatcherChangeTypes.Deleted))
 			{
-				var library = SafetyExtensions.IgnoreExceptions(() => new ShellLibraryEx(Shell32.ShellUtil.GetShellItemForPath(newPath), true));
+				if (newPath is null ||
+					Shell32.ShellUtil.GetShellItemForPath(newPath) is not { } libraryItem)
+				{
+					App.Logger.LogWarning($"Failed to open library after {changeType}: {newPath}");
+					return;
+				}
+
+				var library = SafetyExtensions.IgnoreExceptions(() => new ShellLibraryEx(libraryItem, true));
 				if (library is null)
 				{
 					App.Logger.LogWarning($"Failed to open library after {changeType}: {newPath}");
@@ -392,7 +406,7 @@ private void OnLibraryChanged(WatcherChangeTypes changeType, string oldPath, str
 				string? path = oldPath;
 				if (string.IsNullOrEmpty(oldPath))
 				{
-					path = library1?.FullPath;
+					path = library1.FullPath;
 				}
 				var changedLibrary = Libraries.FirstOrDefault(l => string.Equals(l.Path, path, StringComparison.OrdinalIgnoreCase));
 				if (changedLibrary is not null)
@@ -404,7 +418,7 @@ private void OnLibraryChanged(WatcherChangeTypes changeType, string oldPath, str
 					DataChanged?.Invoke(SectionType.Library, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, changedLibrary));
 				}
 				// library is null in case it was deleted
-				if (library is not null && !Libraries.Any(x => x.Path == library1?.FullPath))
+				if (!Libraries.Any(x => x.Path == library1.FullPath))
 				{
 					var libItem = new LibraryLocationItem(library1);
 					lock (libraries)
@@ -414,7 +428,7 @@ private void OnLibraryChanged(WatcherChangeTypes changeType, string oldPath, str
 					DataChanged?.Invoke(SectionType.Library, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, libItem));
 				}
 
-				library?.Dispose();
+				library.Dispose();
 			}
 		}
 
@@ -441,4 +455,4 @@ public static bool IsLibraryPath(string path)
 		public void Dispose()
 			=> librariesWatcher?.Dispose();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Serialization/BaseJsonSettings.cs b/src/Files.App/Utils/Serialization/BaseJsonSettings.cs
index 215952c8f0ec..e18e3e143c13 100644
--- a/src/Files.App/Utils/Serialization/BaseJsonSettings.cs
+++ b/src/Files.App/Utils/Serialization/BaseJsonSettings.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Runtime.CompilerServices;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Files.App.Utils.Serialization
 {
@@ -77,6 +78,7 @@ protected virtual void Initialize(string filePath)
 			IsAvailable = SettingsSerializer?.CreateFile(filePath) ?? false;
 		}
 
+		[return: NotNullIfNotNull(nameof(defaultValue))]
 		protected virtual TValue? Get<TValue>(TValue? defaultValue, [CallerMemberName] string propertyName = "")
 		{
 			if (string.IsNullOrEmpty(propertyName))
diff --git a/src/Files.App/Utils/Serialization/IJsonSettingsSerializer.cs b/src/Files.App/Utils/Serialization/IJsonSettingsSerializer.cs
index 04d273c60559..2aeb9b0af240 100644
--- a/src/Files.App/Utils/Serialization/IJsonSettingsSerializer.cs
+++ b/src/Files.App/Utils/Serialization/IJsonSettingsSerializer.cs
@@ -5,7 +5,7 @@ namespace Files.App.Utils.Serialization
 {
 	internal interface IJsonSettingsSerializer
 	{
-		string? SerializeToJson(object? obj);
+		string SerializeToJson(object? obj);
 
 		T? DeserializeFromJson<T>(string json);
 	}
diff --git a/src/Files.App/Utils/Serialization/ISettingsSerializer.cs b/src/Files.App/Utils/Serialization/ISettingsSerializer.cs
index 39a508353a45..ee9a27b2b6a9 100644
--- a/src/Files.App/Utils/Serialization/ISettingsSerializer.cs
+++ b/src/Files.App/Utils/Serialization/ISettingsSerializer.cs
@@ -9,6 +9,6 @@ internal interface ISettingsSerializer
 
 		string ReadFromFile();
 
-		bool WriteToFile(string? text);
+		bool WriteToFile(string text);
 	}
 }
diff --git a/src/Files.App/Utils/Serialization/Implementation/DefaultJsonSettingsSerializer.cs b/src/Files.App/Utils/Serialization/Implementation/DefaultJsonSettingsSerializer.cs
index 7965e6cbf534..3b3282025534 100644
--- a/src/Files.App/Utils/Serialization/Implementation/DefaultJsonSettingsSerializer.cs
+++ b/src/Files.App/Utils/Serialization/Implementation/DefaultJsonSettingsSerializer.cs
@@ -10,7 +10,7 @@ internal sealed class DefaultJsonSettingsSerializer : IJsonSettingsSerializer
 			WriteIndented = true
 		};
 
-		public string? SerializeToJson(object? obj)
+		public string SerializeToJson(object? obj)
 		{
 			return JsonSerializer.Serialize(obj, Options);
 		}
diff --git a/src/Files.App/Utils/Serialization/Implementation/DefaultSettingsSerializer.cs b/src/Files.App/Utils/Serialization/Implementation/DefaultSettingsSerializer.cs
index db37b20cd7f5..8a720bcdbcf3 100644
--- a/src/Files.App/Utils/Serialization/Implementation/DefaultSettingsSerializer.cs
+++ b/src/Files.App/Utils/Serialization/Implementation/DefaultSettingsSerializer.cs
@@ -38,10 +38,10 @@ public string ReadFromFile()
 		{
 			ArgumentNullException.ThrowIfNull(_filePath);
 
-			return ReadStringFromFile(_filePath);
+			return ReadStringFromFile(_filePath) ?? string.Empty;
 		}
 
-		public bool WriteToFile(string? text)
+		public bool WriteToFile(string text)
 		{
 			ArgumentNullException.ThrowIfNull(_filePath);
 
diff --git a/src/Files.App/Utils/Shell/ContextMenu.cs b/src/Files.App/Utils/Shell/ContextMenu.cs
index 54cb5eaab4a5..cc685844a10a 100644
--- a/src/Files.App/Utils/Shell/ContextMenu.cs
+++ b/src/Files.App/Utils/Shell/ContextMenu.cs
@@ -22,7 +22,7 @@ public partial class ContextMenu : Win32ContextMenu, IDisposable
 
 		private readonly ThreadWithMessageQueue _owningThread;
 
-		private readonly Func<string, bool>? _itemFilter;
+		private readonly Func<string?, bool>? _itemFilter;
 
 		private readonly Dictionary<List<Win32ContextMenuItem>, Action> _loadSubMenuActions;
 
@@ -31,7 +31,7 @@ public partial class ContextMenu : Win32ContextMenu, IDisposable
 
 		public List<string> ItemsPath { get; }
 
-		private ContextMenu(Shell32.IContextMenu cMenu, User32.SafeHMENU hMenu, IEnumerable<string> itemsPath, ThreadWithMessageQueue owningThread, Func<string, bool>? itemFilter)
+		private ContextMenu(Shell32.IContextMenu cMenu, User32.SafeHMENU hMenu, IEnumerable<string> itemsPath, ThreadWithMessageQueue owningThread, Func<string?, bool>? itemFilter)
 		{
 			_cMenu = cMenu;
 			_hMenu = hMenu;
@@ -43,7 +43,7 @@ private ContextMenu(Shell32.IContextMenu cMenu, User32.SafeHMENU hMenu, IEnumera
 			Items = [];
 		}
 
-		public async static Task<bool> InvokeVerb(string verb, params string[] filePaths)
+		public async static Task<bool> InvokeVerb(string verb, params string?[] filePaths)
 		{
 			using var cMenu = await GetContextMenuForFiles(filePaths, PInvoke.CMF_DEFAULTONLY);
 
@@ -55,7 +55,9 @@ public async Task<bool> InvokeVerb(string? verb)
 			if (string.IsNullOrEmpty(verb))
 				return false;
 
-			var item = Items.FirstOrDefault(x => x.CommandString == verb);
+			var items = Items
+				?? throw new InvalidOperationException("The shell context menu has not been initialized.");
+			var item = items.FirstOrDefault(x => x.CommandString == verb);
 			if (item is not null && item.ID >= 0)
 				// Prefer invocation by ID
 				return await InvokeItem(item.ID);
@@ -116,18 +118,18 @@ public async Task<bool> InvokeItem(int itemID, string? workingDirectory = null)
 			return false;
 		}
 
-		public async static Task<ContextMenu?> GetContextMenuForFiles(string[] filePathList, uint flags, Func<string, bool>? itemFilter = null)
+		public async static Task<ContextMenu?> GetContextMenuForFiles(string?[] filePathList, uint flags, Func<string?, bool>? itemFilter = null)
 		{
 			var owningThread = new ThreadWithMessageQueue();
 
-			return await owningThread.PostMethod<ContextMenu>(() =>
+			return await owningThread.PostMethod<ContextMenu?>(() =>
 			{
 				var shellItems = new List<ShellItem>();
 
 				try
 				{
 					foreach (var filePathItem in filePathList.Where(x => !string.IsNullOrEmpty(x)))
-						shellItems.Add(ShellFolderExtensions.GetShellItemFromPathOrPIDL(filePathItem));
+						shellItems.Add(ShellFolderExtensions.GetShellItemFromPathOrPIDL(filePathItem!));
 
 					return GetContextMenuForFiles([.. shellItems], flags, owningThread, itemFilter);
 				}
@@ -144,14 +146,14 @@ public async Task<bool> InvokeItem(int itemID, string? workingDirectory = null)
 			});
 		}
 
-		public async static Task<ContextMenu?> GetContextMenuForFiles(ShellItem[] shellItems, uint flags, Func<string, bool>? itemFilter = null)
+		public async static Task<ContextMenu?> GetContextMenuForFiles(ShellItem[] shellItems, uint flags, Func<string?, bool>? itemFilter = null)
 		{
 			var owningThread = new ThreadWithMessageQueue();
 
-			return await owningThread.PostMethod<ContextMenu>(() => GetContextMenuForFiles(shellItems, flags, owningThread, itemFilter));
+			return await owningThread.PostMethod<ContextMenu?>(() => GetContextMenuForFiles(shellItems, flags, owningThread, itemFilter));
 		}
 
-		private static ContextMenu? GetContextMenuForFiles(ShellItem[] shellItems, uint flags, ThreadWithMessageQueue owningThread, Func<string, bool>? itemFilter = null)
+		private static ContextMenu? GetContextMenuForFiles(ShellItem[] shellItems, uint flags, ThreadWithMessageQueue owningThread, Func<string?, bool>? itemFilter = null)
 		{
 			if (!shellItems.Any())
 				return null;
@@ -160,12 +162,16 @@ public async Task<bool> InvokeItem(int itemID, string? workingDirectory = null)
 			{
 				// NOTE: The items are all in the same folder
 				using var sf = shellItems[0].Parent;
+				if (sf is null)
+					return null;
 
 				Shell32.IContextMenu menu = sf.GetChildrenUIObjects<Shell32.IContextMenu>(default, shellItems);
 				var hMenu = User32.CreatePopupMenu();
 				menu.QueryContextMenu(hMenu, 0, 1, 0x7FFF, (Shell32.CMF)flags);
-				var contextMenu = new ContextMenu(menu, hMenu, shellItems.Select(x => x.ParsingName), owningThread, itemFilter);
-				contextMenu.EnumMenuItems(hMenu, contextMenu.Items);
+				var contextMenu = new ContextMenu(menu, hMenu, shellItems.Select(x => x.ParsingName).WhereNotNull(), owningThread, itemFilter);
+				var items = contextMenu.Items
+					?? throw new InvalidOperationException("The shell context menu did not initialize its item collection.");
+				contextMenu.EnumMenuItems(hMenu, items);
 
 				return contextMenu;
 			}
@@ -227,7 +233,8 @@ private void EnumMenuItems(Vanara.PInvoke.HMENU hMenu, List<Win32ContextMenuItem
 					menuItem.Label = menuItemInfo.dwTypeData;
 					menuItem.CommandString = GetCommandString(_cMenu, menuItemInfo.wID - 1);
 
-					if (_itemFilter is not null && (_itemFilter(menuItem.CommandString) || _itemFilter(menuItem.Label)))
+					if (_itemFilter is not null &&
+						(_itemFilter(menuItem.CommandString) || _itemFilter(menuItem.Label)))
 					{
 						// Skip items implemented in UWP
 						container.Dispose();
@@ -243,8 +250,8 @@ private void EnumMenuItems(Vanara.PInvoke.HMENU hMenu, List<Win32ContextMenuItem
 							// Make the icon background transparent
 							bitmap.MakeTransparent();
 
-							byte[] bitmapData = (byte[])new ImageConverter().ConvertTo(bitmap, typeof(byte[]));
-							menuItem.Icon = bitmapData;
+							if (new ImageConverter().ConvertTo(bitmap, typeof(byte[])) is byte[] bitmapData)
+								menuItem.Icon = bitmapData;
 						}
 					}
 
@@ -367,7 +374,6 @@ protected virtual void Dispose(bool disposing)
 							(si as IDisposable)?.Dispose();
 						}
 
-						Items = null;
 					}
 				}
 
@@ -375,12 +381,10 @@ protected virtual void Dispose(bool disposing)
 				if (_hMenu is not null)
 				{
 					User32.DestroyMenu(_hMenu);
-					_hMenu = null;
 				}
 				if (_cMenu is not null)
 				{
 					Marshal.ReleaseComObject(_cMenu);
-					_cMenu = null;
 				}
 
 				_owningThread.Dispose();
diff --git a/src/Files.App/Utils/Shell/LaunchHelper.cs b/src/Files.App/Utils/Shell/LaunchHelper.cs
index f6ae1120366d..bfcf0f6c06b6 100644
--- a/src/Files.App/Utils/Shell/LaunchHelper.cs
+++ b/src/Files.App/Utils/Shell/LaunchHelper.cs
@@ -28,7 +28,7 @@ public unsafe static void LaunchSettings(string page)
 				out _);
 		}
 
-		public static Task<bool> LaunchAppAsync(string application, string arguments, string workingDirectory)
+		public static Task<bool> LaunchAppAsync(string application, string? arguments, string? workingDirectory)
 		{
 			return HandleApplicationLaunch(application, arguments, workingDirectory);
 		}
@@ -54,7 +54,7 @@ public static Task<bool> RunCompatibilityTroubleshooterAsync(string filePath)
 			return HandleApplicationLaunch("MSDT.exe", $"/id PCWDiagnostic /af \"{compatibilityTroubleshooterAnswerFile}\"", "");
 		}
 
-		private static async Task<bool> HandleApplicationLaunch(string application, string arguments, string workingDirectory)
+		private static async Task<bool> HandleApplicationLaunch(string application, string? arguments, string? workingDirectory)
 		{
 			var currentWindows = Win32Helper.GetDesktopWindows();
 
@@ -107,14 +107,14 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 						string key = (string)ent.Key;
 
 						// Skip USERNAME to avoid issues where files were executed as SYSTEM user (#12139)
-						if (string.Equals(key, "USERNAME", StringComparison.OrdinalIgnoreCase)) 
+						if (string.Equals(key, "USERNAME", StringComparison.OrdinalIgnoreCase))
 							continue;
 
-						process.StartInfo.EnvironmentVariables[key] = (string)ent.Value;
+						process.StartInfo.EnvironmentVariables[key] = (string)ent.Value!;
 					}
 
 					foreach (DictionaryEntry ent in Environment.GetEnvironmentVariables(EnvironmentVariableTarget.User))
-						process.StartInfo.EnvironmentVariables[(string)ent.Key] = (string)ent.Value;
+						process.StartInfo.EnvironmentVariables[(string)ent.Key] = (string)ent.Value!;
 
 					process.StartInfo.EnvironmentVariables["PATH"] = string.Join(';',
 						Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine),
@@ -202,7 +202,11 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 									using var cMenu = await ContextMenu.GetContextMenuForFiles(new[] { application }, PInvoke.CMF_DEFAULTONLY);
 
 									if (cMenu is not null)
-										await cMenu.InvokeItem(cMenu.Items.FirstOrDefault()?.ID ?? -1);
+									{
+										var menuItems = cMenu.Items
+											?? throw new InvalidOperationException("The shell context menu has no item collection.");
+										await cMenu.InvokeItem(menuItems.FirstOrDefault()?.ID ?? -1);
+									}
 
 									return true;
 								}, App.Logger);
@@ -214,7 +218,11 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 							var isAlternateStream = RegexHelpers.AlternateStream().IsMatch(application);
 							if (isAlternateStream)
 							{
-								var basePath = Path.Combine(Environment.GetEnvironmentVariable("TEMP"), Guid.NewGuid().ToString("n"));
+								var tempPathRoot = Environment.GetEnvironmentVariable("TEMP");
+								if (tempPathRoot is null)
+									return false;
+
+								var basePath = Path.Combine(tempPathRoot, Guid.NewGuid().ToString("n"));
 								Kernel32.CreateDirectory(basePath);
 
 								var tempPath = Path.Combine(basePath, new string(Path.GetFileName(application).SkipWhile(x => x != ':').Skip(1).ToArray()));
@@ -268,7 +276,11 @@ private static string GetMtpPath(string executable)
 			if (executable.StartsWith("\\\\?\\", StringComparison.Ordinal))
 			{
 				using var computer = new ShellFolder(Shell32.KNOWNFOLDERID.FOLDERID_ComputerFolder);
-				using var device = computer.FirstOrDefault(i => executable.Replace("\\\\?\\", "", StringComparison.Ordinal).StartsWith(i.Name, StringComparison.Ordinal));
+				using var device = computer.FirstOrDefault(i =>
+				{
+					return i.Name is { } name &&
+						executable.Replace("\\\\?\\", "", StringComparison.Ordinal).StartsWith(name, StringComparison.Ordinal);
+				});
 				var deviceId = device?.ParsingName;
 				var itemPath = RegexHelpers.WindowsPath().Replace(executable, "");
 				return deviceId is not null ? Path.Combine(deviceId, itemPath) : executable;
diff --git a/src/Files.App/Utils/Shell/OpenWithMenu.cs b/src/Files.App/Utils/Shell/OpenWithMenu.cs
index c4b5350c5427..e49c8c8180c8 100644
--- a/src/Files.App/Utils/Shell/OpenWithMenu.cs
+++ b/src/Files.App/Utils/Shell/OpenWithMenu.cs
@@ -188,7 +188,8 @@ private unsafe void EnumMenuItems(HMENU hMenu)
 						if (bitmap is not null)
 						{
 							bitmap.MakeTransparent();
-							menuItem.Icon = (byte[])IconConverter.ConvertTo(bitmap, typeof(byte[]));
+							if (IconConverter.ConvertTo(bitmap, typeof(byte[])) is byte[] icon)
+								menuItem.Icon = icon;
 						}
 					}
 
diff --git a/src/Files.App/Utils/Shell/ShellFileOperations2.cs b/src/Files.App/Utils/Shell/ShellFileOperations2.cs
index 05fba030f96a..2743602b5dc4 100644
--- a/src/Files.App/Utils/Shell/ShellFileOperations2.cs
+++ b/src/Files.App/Utils/Shell/ShellFileOperations2.cs
@@ -12,11 +12,12 @@ public partial class ShellFileOperations2 : IDisposable
 {
 	private const OperationFlags defaultOptions = OperationFlags.AllowUndo | OperationFlags.NoConfirmMkDir;
 	private int disposedValue = 0;
-	private IFileOperation op;
+	private IFileOperation? op;
 	private OperationFlags opFlags = defaultOptions;
 	private HWND owner;
 	private readonly IFileOperationProgressSink sink;
 	private readonly uint sinkCookie;
+	private IFileOperation Operation => op ?? throw new ObjectDisposedException(nameof(ShellFileOperations2));
 
 	/// <summary>Initializes a new instance of the <see cref="ShellFileOperations"/> class.</summary>
 	/// <param name="owner">The window that owns the modal dialog. This value can be <see langword="null"/>.</param>
@@ -28,11 +29,11 @@ public ShellFileOperations2(HWND owner = default)
 		//op = new IFileOperation();
 		if (owner != default)
 		{
-			op.SetOwnerWindow(owner);
+			Operation.SetOwnerWindow(owner);
 		}
 
 		sink = new OpSink(this);
-		sinkCookie = op.Advise(sink);
+		sinkCookie = Operation.Advise(sink);
 	}
 
 	/// <summary>Initializes a new instance of the <see cref="ShellFileOperations"/> class.</summary>
@@ -41,7 +42,7 @@ public ShellFileOperations2(IFileOperation operation)
 	{
 		op = operation;
 		sink = new OpSink(this);
-		sinkCookie = op.Advise(sink);
+		sinkCookie = Operation.Advise(sink);
 	}
 
 	/// <summary>Finalizes an instance of the <see cref="ShellFileOperations"/> class.</summary>
@@ -51,56 +52,56 @@ public ShellFileOperations2(IFileOperation operation)
 	}
 
 	/// <summary>Performs caller-implemented actions after the last operation performed by the call to IFileOperation is complete.</summary>
-	public event EventHandler<ShellFileOpEventArgs> FinishOperations;
+	public event EventHandler<ShellFileOpEventArgs>? FinishOperations;
 
 	/// <summary>Performs caller-implemented actions after the copy process for each item is complete.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PostCopyItem;
+	public event EventHandler<ShellFileOpEventArgs>? PostCopyItem;
 
 	/// <summary>Performs caller-implemented actions after the delete process for each item is complete.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PostDeleteItem;
+	public event EventHandler<ShellFileOpEventArgs>? PostDeleteItem;
 
 	/// <summary>Performs caller-implemented actions after the move process for each item is complete.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PostMoveItem;
+	public event EventHandler<ShellFileOpEventArgs>? PostMoveItem;
 
 	/// <summary>Performs caller-implemented actions after the new item is created.</summary>
-	public event EventHandler<ShellFileNewOpEventArgs> PostNewItem;
+	public event EventHandler<ShellFileNewOpEventArgs>? PostNewItem;
 
 	/// <summary>Performs caller-implemented actions after the rename process for each item is complete.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PostRenameItem;
+	public event EventHandler<ShellFileOpEventArgs>? PostRenameItem;
 
 	/// <summary>Performs caller-implemented actions before the copy process for each item begins.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PreCopyItem;
+	public event EventHandler<ShellFileOpEventArgs>? PreCopyItem;
 
 	/// <summary>Performs caller-implemented actions before the delete process for each item begins.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PreDeleteItem;
+	public event EventHandler<ShellFileOpEventArgs>? PreDeleteItem;
 
 	/// <summary>Performs caller-implemented actions before the move process for each item begins.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PreMoveItem;
+	public event EventHandler<ShellFileOpEventArgs>? PreMoveItem;
 
 	/// <summary>Performs caller-implemented actions before the process to create a new item begins.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PreNewItem;
+	public event EventHandler<ShellFileOpEventArgs>? PreNewItem;
 
 	/// <summary>Performs caller-implemented actions before the rename process for each item begins.</summary>
-	public event EventHandler<ShellFileOpEventArgs> PreRenameItem;
+	public event EventHandler<ShellFileOpEventArgs>? PreRenameItem;
 
 	/// <summary>Performs caller-implemented actions before any specific file operations are performed.</summary>
-	public event EventHandler StartOperations;
+	public event EventHandler? StartOperations;
 
 	/// <summary>Occurs when a progress update is received.</summary>
-	public event ProgressChangedEventHandler UpdateProgress;
+	public event ProgressChangedEventHandler? UpdateProgress;
 
 	/// <summary>
 	/// Gets a value that states whether any file operations initiated by a call to <see cref="PerformOperations"/> were stopped before they
 	/// were complete. The operations could be stopped either by user action or silently by the system.
 	/// </summary>
 	/// <value><see langword="true"/> if any file operations were aborted before they were complete; otherwise, <see langword="false"/>.</value>
-	public bool AnyOperationsAborted => op.GetAnyOperationsAborted();
+	public bool AnyOperationsAborted => Operation.GetAnyOperationsAborted();
 
 	/// <summary>Gets or sets options that control file operations.</summary>
 	public OperationFlags Options
 	{
 		get => opFlags;
-		set { if (value == opFlags) { return; } op.SetOperationFlags((FILEOP_FLAGS)(opFlags = value)); }
+		set { if (value == opFlags) { return; } Operation.SetOperationFlags((FILEOP_FLAGS)(opFlags = value)); }
 	}
 
 	/// <summary>Gets or sets the parent or owner window for progress and dialog windows.</summary>
@@ -108,7 +109,7 @@ public OperationFlags Options
 	public HWND OwnerWindow
 	{
 		get => owner;
-		set => op.SetOwnerWindow(owner = value);
+		set => Operation.SetOwnerWindow(owner = value);
 	}
 
 	/// <summary>Gets the number of queued operations.</summary>
@@ -122,7 +123,7 @@ public HWND OwnerWindow
 	/// of the destination item is the same as the source.
 	/// </param>
 	/// <param name="options">Options that control file operations.</param>
-	public static void Copy(string source, string dest, string newName = null, OperationFlags options = defaultOptions)
+	public static void Copy(string source, string dest, string? newName = null, OperationFlags options = defaultOptions)
 	{
 		using ShellItem shfile = new(source);
 		using ShellFolder shfld = new(dest);
@@ -137,7 +138,7 @@ public static void Copy(string source, string dest, string newName = null, Opera
 	/// of the destination item is the same as the source.
 	/// </param>
 	/// <param name="options">Options that control file operations.</param>
-	public static void Copy(ShellItem source, ShellFolder dest, string newName = null, OperationFlags options = defaultOptions)
+	public static void Copy(ShellItem source, ShellFolder dest, string? newName = null, OperationFlags options = defaultOptions)
 	{
 		using ShellFileOperations2 sop = new();
 		sop.Options = options;
@@ -154,7 +155,7 @@ public static void Copy(ShellItem source, ShellFolder dest, string newName = nul
 			sop.PostCopyItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Copies a set of items to a specified destination using the Shell to provide progress and error dialogs.</summary>
@@ -180,7 +181,7 @@ public static void Copy(IEnumerable<ShellItem> sourceItems, ShellFolder dest, Op
 			sop.PostCopyItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Deletes a single item using the Shell to provide progress and error dialogs.</summary>
@@ -212,7 +213,7 @@ public static void Delete(ShellItem source, OperationFlags options = defaultOpti
 			sop.PostDeleteItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Deletes a set of items using the Shell to provide progress and error dialogs.</summary>
@@ -237,7 +238,7 @@ public static void Delete(IEnumerable<ShellItem> sourceItems, OperationFlags opt
 			sop.PostDeleteItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Moves a single item to a specified destination using the Shell to provide progress and error dialogs.</summary>
@@ -248,7 +249,7 @@ public static void Delete(IEnumerable<ShellItem> sourceItems, OperationFlags opt
 	/// destination item is the same as the source.
 	/// </param>
 	/// <param name="options">Options that control file operations.</param>
-	public static void Move(string source, string dest, string newName = null, OperationFlags options = defaultOptions)
+	public static void Move(string source, string dest, string? newName = null, OperationFlags options = defaultOptions)
 	{
 		using ShellItem shfile = new(source);
 		using ShellFolder shfld = new(dest);
@@ -263,7 +264,7 @@ public static void Move(string source, string dest, string newName = null, Opera
 	/// destination item is the same as the source.
 	/// </param>
 	/// <param name="options">Options that control file operations.</param>
-	public static void Move(ShellItem source, ShellFolder dest, string newName = null, OperationFlags options = defaultOptions)
+	public static void Move(ShellItem source, ShellFolder dest, string? newName = null, OperationFlags options = defaultOptions)
 	{
 		using ShellFileOperations2 sop = new() { Options = options };
 		HRESULT hr = HRESULT.S_OK;
@@ -279,7 +280,7 @@ public static void Move(ShellItem source, ShellFolder dest, string newName = nul
 			sop.PostMoveItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Moves a set of items to a specified destination using the Shell to provide progress and error dialogs.</summary>
@@ -305,7 +306,7 @@ public static void Move(IEnumerable<ShellItem> sourceItems, ShellFolder dest, Op
 			sop.PostMoveItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Creates a new item in a specified location using the Shell to provide progress and error dialogs.</summary>
@@ -332,7 +333,7 @@ public static void Move(IEnumerable<ShellItem> sourceItems, ShellFolder dest, Op
 	/// <para>This parameter is normally <see langword="null"/> to specify a new, blank file.</para>
 	/// </param>
 	/// <param name="options">Options that control file operations.</param>
-	public static void NewItem(ShellFolder dest, string name, System.IO.FileAttributes attr = System.IO.FileAttributes.Normal, string template = null, OperationFlags options = defaultOptions)
+	public static void NewItem(ShellFolder dest, string name, System.IO.FileAttributes attr = System.IO.FileAttributes.Normal, string? template = null, OperationFlags options = defaultOptions)
 	{
 		using ShellFileOperations2 sop = new();
 		sop.Options = options;
@@ -349,15 +350,17 @@ public static void NewItem(ShellFolder dest, string name, System.IO.FileAttribut
 			sop.PostRenameItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Renames a single item to a new display name using the Shell to provide progress and error dialogs.</summary>
 	/// <param name="source">A <see cref="ShellItem"/> that specifies the source item.</param>
 	/// <param name="newName">The new display name of the item.</param>
 	/// <param name="options">Options that control file operations.</param>
-	public static void Rename(ShellItem source, string newName = null, OperationFlags options = defaultOptions)
+	public static void Rename(ShellItem source, string? newName = null, OperationFlags options = defaultOptions)
 	{
+		ArgumentNullException.ThrowIfNull(newName);
+
 		using ShellFileOperations2 sop = new();
 		sop.Options = options;
 		HRESULT hr = HRESULT.S_OK;
@@ -373,7 +376,7 @@ public static void Rename(ShellItem source, string newName = null, OperationFlag
 			sop.PostRenameItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>
@@ -402,7 +405,7 @@ public static void Rename(IEnumerable<ShellItem> sourceItems, string newName, Op
 			sop.PostRenameItem -= OnPost;
 		}
 
-		void OnPost(object sender, ShellFileOpEventArgs e) => hr = e.Result;
+		void OnPost(object? sender, ShellFileOpEventArgs e) => hr = e.Result;
 	}
 
 	/// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
@@ -420,7 +423,7 @@ public void Dispose()
 	/// </remarks>
 	public void PerformOperations()
 	{
-		op.PerformOperations();
+		Operation.PerformOperations();
 		QueuedOperations = 0;
 	}
 
@@ -431,8 +434,8 @@ public void PerformOperations()
 	/// </param>
 	public void QueueApplyPropertiesOperation(ShellItem item, ShellItemPropertyUpdates props)
 	{
-		op.SetProperties(props.IPropertyChangeArray);
-		op.ApplyPropertiesToItem(item.IShellItem);
+		Operation.SetProperties(props.IPropertyChangeArray);
+		Operation.ApplyPropertiesToItem(item.IShellItem);
 		QueuedOperations++;
 	}
 
@@ -445,8 +448,8 @@ public void QueueApplyPropertiesOperation(ShellItem item, ShellItemPropertyUpdat
 	/// </param>
 	public void QueueApplyPropertiesOperation(IEnumerable<ShellItem> items, ShellItemPropertyUpdates props)
 	{
-		op.SetProperties(props.IPropertyChangeArray);
-		op.ApplyPropertiesToItems(GetSHArray(items).IShellItemArray);
+		Operation.SetProperties(props.IPropertyChangeArray);
+		Operation.ApplyPropertiesToItems(GetRequiredShellItemArray(items));
 		QueuedOperations++;
 	}
 
@@ -457,9 +460,9 @@ public void QueueApplyPropertiesOperation(IEnumerable<ShellItem> items, ShellIte
 	/// An optional new name for the item after it has been copied. This can be <see langword="null"/>. If <see langword="null"/>, the name
 	/// of the destination item is the same as the source.
 	/// </param>
-	public void QueueCopyOperation(ShellItem source, ShellFolder dest, string newName = null)
+	public void QueueCopyOperation(ShellItem source, ShellFolder dest, string? newName = null)
 	{
-		op.CopyItem(source.IShellItem, dest.IShellItem, newName, null);
+		Operation.CopyItem(source.IShellItem, dest.IShellItem, newName, null);
 		QueuedOperations++;
 	}
 
@@ -470,7 +473,7 @@ public void QueueCopyOperation(ShellItem source, ShellFolder dest, string newNam
 	/// <param name="dest">A <see cref="ShellFolder"/> that specifies the destination folder to contain the copy of the items.</param>
 	public void QueueCopyOperation(IEnumerable<ShellItem> sourceItems, ShellFolder dest)
 	{
-		op.CopyItems(GetSHArray(sourceItems).IShellItemArray, dest.IShellItem);
+		Operation.CopyItems(GetRequiredShellItemArray(sourceItems), dest.IShellItem);
 		QueuedOperations++;
 	}
 
@@ -478,7 +481,7 @@ public void QueueCopyOperation(IEnumerable<ShellItem> sourceItems, ShellFolder d
 	/// <param name="item">&gt;A <see cref="ShellItem"/> that specifies the item to be deleted.</param>
 	public void QueueDeleteOperation(ShellItem item)
 	{
-		op.DeleteItem(item.IShellItem, null);
+		Operation.DeleteItem(item.IShellItem, null);
 		QueuedOperations++;
 	}
 
@@ -488,7 +491,7 @@ public void QueueDeleteOperation(ShellItem item)
 	/// </param>
 	public void QueueDeleteOperation(IEnumerable<ShellItem> items)
 	{
-		op.DeleteItems(GetSHArray(items).IShellItemArray);
+		Operation.DeleteItems(GetRequiredShellItemArray(items));
 		QueuedOperations++;
 	}
 
@@ -499,9 +502,9 @@ public void QueueDeleteOperation(IEnumerable<ShellItem> items)
 	/// An optional new name for the item in its new location. This can be <see langword="null"/>. If <see langword="null"/>, the name of the
 	/// destination item is the same as the source.
 	/// </param>
-	public void QueueMoveOperation(ShellItem source, ShellFolder dest, string newName = null)
+	public void QueueMoveOperation(ShellItem source, ShellFolder dest, string? newName = null)
 	{
-		op.MoveItem(source.IShellItem, dest.IShellItem, newName, null);
+		Operation.MoveItem(source.IShellItem, dest.IShellItem, newName, null);
 		QueuedOperations++;
 	}
 
@@ -512,7 +515,7 @@ public void QueueMoveOperation(ShellItem source, ShellFolder dest, string newNam
 	/// <param name="dest">A <see cref="ShellFolder"/> that specifies the destination folder to contain the moved items.</param>
 	public void QueueMoveOperation(IEnumerable<ShellItem> sourceItems, ShellFolder dest)
 	{
-		op.MoveItems(GetSHArray(sourceItems).IShellItemArray, dest.IShellItem);
+		Operation.MoveItems(GetRequiredShellItemArray(sourceItems), dest.IShellItem);
 		QueuedOperations++;
 	}
 
@@ -539,9 +542,9 @@ public void QueueMoveOperation(IEnumerable<ShellItem> sourceItems, ShellFolder d
 	/// </para>
 	/// <para>This parameter is normally <see langword="null"/> to specify a new, blank file.</para>
 	/// </param>
-	public void QueueNewItemOperation(ShellFolder dest, string name, System.IO.FileAttributes attr = System.IO.FileAttributes.Normal, string template = null)
+	public void QueueNewItemOperation(ShellFolder dest, string name, System.IO.FileAttributes attr = System.IO.FileAttributes.Normal, string? template = null)
 	{
-		op.NewItem(dest.IShellItem, attr, name, template, null);
+		Operation.NewItem(dest.IShellItem, attr, name, template, null);
 		QueuedOperations++;
 	}
 
@@ -550,7 +553,7 @@ public void QueueNewItemOperation(ShellFolder dest, string name, System.IO.FileA
 	/// <param name="newName">The new display name of the item.</param>
 	public void QueueRenameOperation(ShellItem source, string newName)
 	{
-		op.RenameItem(source.IShellItem, newName, null);
+		Operation.RenameItem(source.IShellItem, newName, null);
 		QueuedOperations++;
 	}
 
@@ -561,7 +564,7 @@ public void QueueRenameOperation(ShellItem source, string newName)
 	/// <param name="newName">The new display name of the items.</param>
 	public void QueueRenameOperation(IEnumerable<ShellItem> sourceItems, string newName)
 	{
-		op.RenameItems(GetSHArray(sourceItems).IShellItemArray, newName);
+		Operation.RenameItems(GetRequiredShellItemArray(sourceItems), newName);
 		QueuedOperations++;
 	}
 
@@ -576,7 +579,7 @@ protected virtual void Dispose(bool disposing)
 				// Dispose managed state (managed objects).
 			}
 
-			if (sink != null && op != null)
+			if (op is not null)
 			{
 				op.Unadvise(sinkCookie);
 			}
@@ -585,7 +588,9 @@ protected virtual void Dispose(bool disposing)
 		}
 	}
 
-	private ShellItemArray GetSHArray(IEnumerable<ShellItem> items) => items is ShellItemArray a ? a : new ShellItemArray(items);
+	private static IShellItemArray GetRequiredShellItemArray(IEnumerable<ShellItem> items) =>
+		(items is ShellItemArray array ? array : new ShellItemArray(items)).IShellItemArray ??
+		throw new InvalidOperationException("Unable to create a shell item array.");
 
 	private sealed class OpSink : IFileOperationProgressSink
 	{
@@ -651,7 +656,7 @@ private HRESULT CallChkErr(Action action)
 	/// <seealso cref="ShellFileOpEventArgs"/>
 	public sealed class ShellFileNewOpEventArgs : ShellFileOpEventArgs
 	{
-		internal ShellFileNewOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem source, IShellItem folder, IShellItem dest, string name, HRESULT hr, string templ, uint attr) :
+		internal ShellFileNewOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem? source, IShellItem folder, IShellItem dest, string name, HRESULT hr, string? templ, uint attr) :
 			base(flags, source, folder, dest, name, hr)
 		{
 			TemplateName = templ;
@@ -660,7 +665,7 @@ internal ShellFileNewOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem source,
 
 		/// <summary>Gets the name of the template.</summary>
 		/// <value>The name of the template.</value>
-		public string TemplateName { get; private set; }
+		public string? TemplateName { get; private set; }
 
 		/// <summary>Gets the file attributes.</summary>
 		/// <value>The file attributes.</value>
@@ -673,7 +678,7 @@ internal ShellFileNewOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem source,
 	/// <seealso cref="EventArgs"/>
 	public class ShellFileOpEventArgs : EventArgs
 	{
-		internal ShellFileOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem source, IShellItem folder = null, IShellItem dest = null, string name = null, HRESULT hr = default)
+		internal ShellFileOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem? source, IShellItem? folder = null, IShellItem? dest = null, string? name = null, HRESULT hr = default)
 		{
 			Flags = (TransferFlags)flags;
 			if (source != null) try { SourceItem = ShellItem.Open(source); } catch { }
@@ -685,11 +690,11 @@ internal ShellFileOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem source, IS
 
 		/// <summary>Gets the destination folder.</summary>
 		/// <value>The destination folder.</value>
-		public ShellItem DestFolder { get; protected set; }
+		public ShellItem? DestFolder { get; protected set; }
 
 		/// <summary>Gets the destination item.</summary>
 		/// <value>The destination item.</value>
-		public ShellItem DestItem { get; protected set; }
+		public ShellItem? DestItem { get; protected set; }
 
 		/// <summary>Gets the tranfer flag values.</summary>
 		/// <value>The flags.</value>
@@ -697,7 +702,7 @@ internal ShellFileOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem source, IS
 
 		/// <summary>Gets the name of the item.</summary>
 		/// <value>The item name.</value>
-		public string Name { get; protected set; }
+		public string? Name { get; protected set; }
 
 		/// <summary>Gets the result of the operation.</summary>
 		/// <value>The result.</value>
@@ -705,7 +710,7 @@ internal ShellFileOpEventArgs(TRANSFER_SOURCE_FLAGS flags, IShellItem source, IS
 
 		/// <summary>Gets the source item.</summary>
 		/// <value>The source item.</value>
-		public ShellItem SourceItem { get; protected set; }
+		public ShellItem? SourceItem { get; protected set; }
 
 		/// <summary>Returns a <see cref="System.String"/> that represents this instance.</summary>
 		/// <returns>A <see cref="System.String"/> that represents this instance.</returns>
diff --git a/src/Files.App/Utils/Shell/ShellFolderExtensions.cs b/src/Files.App/Utils/Shell/ShellFolderExtensions.cs
index d9c8dbdadbd8..c045fbfbb509 100644
--- a/src/Files.App/Utils/Shell/ShellFolderExtensions.cs
+++ b/src/Files.App/Utils/Shell/ShellFolderExtensions.cs
@@ -17,32 +17,32 @@ public static ShellLibraryItem GetShellLibraryItem(ShellLibraryEx library, strin
 			var libraryItem = new ShellLibraryItem
 			{
 				FullPath = filePath,
-				AbsolutePath = library.GetDisplayName(ShellItemDisplayString.DesktopAbsoluteParsing),
-				RelativePath = library.GetDisplayName(ShellItemDisplayString.ParentRelativeParsing),
-				DisplayName = library.GetDisplayName(ShellItemDisplayString.NormalDisplay),
+				AbsolutePath = library.GetDisplayName(ShellItemDisplayString.DesktopAbsoluteParsing) ?? string.Empty,
+				RelativePath = library.GetDisplayName(ShellItemDisplayString.ParentRelativeParsing) ?? string.Empty,
+				DisplayName = library.GetDisplayName(ShellItemDisplayString.NormalDisplay) ?? string.Empty,
 				IsPinned = library.PinnedToNavigationPane,
 			};
 
 			var folders = library.Folders;
 			if (folders.Count > 0)
 			{
-				libraryItem.DefaultSaveFolder = SafetyExtensions.IgnoreExceptions(() => library.DefaultSaveFolder.FileSystemPath);
-				libraryItem.Folders = folders.Select(f => f.FileSystemPath).ToArray();
+				libraryItem.DefaultSaveFolder = SafetyExtensions.IgnoreExceptions(() => library.DefaultSaveFolder.FileSystemPath) ?? string.Empty;
+				libraryItem.Folders = folders.Select(f => f.FileSystemPath).OfType<string>().ToArray();
 			}
 
 			return libraryItem;
 		}
 
-		private static T TryGetProperty<T>(this ShellItemPropertyStore sip, Ole32.PROPERTYKEY key)
+		private static T? TryGetProperty<T>(this ShellItemPropertyStore sip, Ole32.PROPERTYKEY key)
 		{
-			T value = default;
+			T? value = default;
 
 			SafetyExtensions.IgnoreExceptions(() => sip.TryGetValue<T>(key, out value));
 
 			return value;
 		}
 
-		public static ShellFileItem GetShellFileItem(ShellItem folderItem)
+		public static ShellFileItem? GetShellFileItem(ShellItem? folderItem)
 		{
 			if (folderItem is null)
 				return null;
@@ -107,13 +107,13 @@ public static ShellFileItem GetShellFileItem(ShellItem folderItem)
 
 			var createdDate = fileTime?.ToDateTime().ToLocalTime() ?? SafetyExtensions.IgnoreExceptions(() => folderItem.FileInfo?.CreationTime) ?? DateTime.Now; // This is LocalTime
 			var fileSizeBytes = folderItem.Properties.TryGetProperty<ulong?>(Ole32.PROPERTYKEY.System.Size);
-			string fileSize = fileSizeBytes is not null ? folderItem.Properties.GetPropertyString(Ole32.PROPERTYKEY.System.Size) : null;
+			string? fileSize = fileSizeBytes is not null ? folderItem.Properties.GetPropertyString(Ole32.PROPERTYKEY.System.Size) : null;
 			var fileType = folderItem.Properties.TryGetProperty<string>(Ole32.PROPERTYKEY.System.ItemTypeText);
 
 			return new(isFolder, parsingPath, fileName, filePath, recycleDate, modifiedDate, createdDate, fileSize, fileSizeBytes ?? 0, fileType, folderItem.PIDL.GetBytes());
 		}
 
-		public static ShellLinkItem GetShellLinkItem(ShellLink linkItem)
+		public static ShellLinkItem? GetShellLinkItem(ShellLink? linkItem)
 		{
 			if (linkItem is null)
 				return null;
@@ -135,7 +135,7 @@ public static ShellLinkItem GetShellLinkItem(ShellLink linkItem)
 			return link;
 		}
 
-		public static string GetParsingPath(this ShellItem item)
+		public static string? GetParsingPath(this ShellItem? item)
 		{
 			if (item is null)
 				return null;
diff --git a/src/Files.App/Utils/Shell/ShellLibraryEx.cs b/src/Files.App/Utils/Shell/ShellLibraryEx.cs
index 0ef9ed8872f3..79490e991b39 100644
--- a/src/Files.App/Utils/Shell/ShellLibraryEx.cs
+++ b/src/Files.App/Utils/Shell/ShellLibraryEx.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Windows.Forms;
+using System.Diagnostics.CodeAnalysis;
 using Vanara.Extensions;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
@@ -15,11 +16,14 @@ public sealed partial class ShellLibraryEx : ShellFolder
 	{
 		//private const string ext = ".library-ms";
 
-		internal Shell32.IShellLibrary _lib;
+		internal Shell32.IShellLibrary? _lib;
 
-		private ShellLibraryFolders _folders;
+		private Shell32.IShellLibrary Library
+			=> _lib ?? throw new ObjectDisposedException(nameof(ShellLibraryEx));
 
-		private string _name;
+		private ShellLibraryFolders? _folders;
+
+		private string? _name;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ShellLibrary"/>Ex class.
@@ -29,7 +33,7 @@ public sealed partial class ShellLibraryEx : ShellFolder
 		public ShellLibraryEx(Shell32.KNOWNFOLDERID knownFolderId, bool readOnly = false)
 		{
 			_lib = new Shell32.IShellLibrary();
-			_lib.LoadLibraryFromKnownFolder(knownFolderId.Guid(), readOnly ? STGM.STGM_READ : STGM.STGM_READWRITE);
+			Library.LoadLibraryFromKnownFolder(knownFolderId.Guid(), readOnly ? STGM.STGM_READ : STGM.STGM_READWRITE);
 
 			Init(knownFolderId.GetIShellItem());
 		}
@@ -44,7 +48,7 @@ public ShellLibraryEx(string libraryName, Shell32.KNOWNFOLDERID kf = Shell32.KNO
 		{
 			_lib = new Shell32.IShellLibrary();
 			_name = libraryName;
-			var item = _lib.SaveInKnownFolder(kf.Guid(), libraryName, overwrite ? Shell32.LIBRARYSAVEFLAGS.LSF_OVERRIDEEXISTING : Shell32.LIBRARYSAVEFLAGS.LSF_FAILIFTHERE);
+			var item = Library.SaveInKnownFolder(kf.Guid(), libraryName, overwrite ? Shell32.LIBRARYSAVEFLAGS.LSF_OVERRIDEEXISTING : Shell32.LIBRARYSAVEFLAGS.LSF_FAILIFTHERE);
 
 			Init(item);
 		}
@@ -59,7 +63,7 @@ public ShellLibraryEx(string libraryName, ShellFolder parent, bool overwrite = f
 		{
 			_lib = new Shell32.IShellLibrary();
 			_name = libraryName;
-			var item = _lib.Save(parent.IShellItem, libraryName, overwrite ? Shell32.LIBRARYSAVEFLAGS.LSF_OVERRIDEEXISTING : Shell32.LIBRARYSAVEFLAGS.LSF_FAILIFTHERE);
+			var item = Library.Save(parent.IShellItem, libraryName, overwrite ? Shell32.LIBRARYSAVEFLAGS.LSF_OVERRIDEEXISTING : Shell32.LIBRARYSAVEFLAGS.LSF_FAILIFTHERE);
 
 			Init(item);
 		}
@@ -72,7 +76,7 @@ public ShellLibraryEx(string libraryName, ShellFolder parent, bool overwrite = f
 		public ShellLibraryEx(Shell32.IShellItem libraryItem, bool readOnly = false)
 		{
 			_lib = new Shell32.IShellLibrary();
-			_lib.LoadLibraryFromItem(libraryItem, readOnly ? STGM.STGM_READ : STGM.STGM_READWRITE);
+			Library.LoadLibraryFromItem(libraryItem, readOnly ? STGM.STGM_READ : STGM.STGM_READWRITE);
 
 			Init(libraryItem);
 		}
@@ -83,8 +87,8 @@ public ShellLibraryEx(Shell32.IShellItem libraryItem, bool readOnly = false)
 		/// <value>The default save folder.</value>
 		public ShellItem DefaultSaveFolder
 		{
-			get => Open(_lib.GetDefaultSaveFolder<Shell32.IShellItem>(Shell32.DEFAULTSAVEFOLDERTYPE.DSFT_DETECT));
-			set => _lib.SetDefaultSaveFolder(Shell32.DEFAULTSAVEFOLDERTYPE.DSFT_DETECT, value.IShellItem);
+			get => Open(Library.GetDefaultSaveFolder<Shell32.IShellItem>(Shell32.DEFAULTSAVEFOLDERTYPE.DSFT_DETECT));
+			set => Library.SetDefaultSaveFolder(Shell32.DEFAULTSAVEFOLDERTYPE.DSFT_DETECT, value.IShellItem);
 		}
 
 		/// <summary>Gets the set of child folders that are contained in the library.</summary>
@@ -104,15 +108,16 @@ public IconLocation IconLocation
 		{
 			get
 			{
-				_ = IconLocation.TryParse(_lib.GetIcon(), out var l);
+				_ = IconLocation.TryParse(Library.GetIcon(), out var l);
 				return l;
 			}
-			set => _lib.SetIcon(value.ToString());
+			set => Library.SetIcon(value.ToString());
 		}
 
 		/// <summary>
 		/// Gets the name relative to the parent for the item.
 		/// </summary>
+		[AllowNull, MaybeNull]
 		public override string Name
 		{
 			get => _name;
@@ -127,8 +132,8 @@ public override string Name
 		/// </value>
 		public bool PinnedToNavigationPane
 		{
-			get => _lib.GetOptions().IsFlagSet(Shell32.LIBRARYOPTIONFLAGS.LOF_PINNEDTONAVPANE);
-			set => _lib.SetOptions(Shell32.LIBRARYOPTIONFLAGS.LOF_PINNEDTONAVPANE, value ? Shell32.LIBRARYOPTIONFLAGS.LOF_PINNEDTONAVPANE : 0);
+			get => Library.GetOptions().IsFlagSet(Shell32.LIBRARYOPTIONFLAGS.LOF_PINNEDTONAVPANE);
+			set => Library.SetOptions(Shell32.LIBRARYOPTIONFLAGS.LOF_PINNEDTONAVPANE, value ? Shell32.LIBRARYOPTIONFLAGS.LOF_PINNEDTONAVPANE : 0);
 		}
 
 		/// <summary>
@@ -155,8 +160,8 @@ public LibraryViewTemplate ViewTemplate
 		/// </value>
 		public Guid ViewTemplateId
 		{
-			get => _lib.GetFolderType();
-			set => _lib.SetFolderType(value);
+			get => Library.GetFolderType();
+			set => Library.SetFolderType(value);
 		}
 
 		/// <summary>
@@ -172,7 +177,7 @@ public void Reload()
 		/// </summary>
 		public void Commit()
 		{
-			_lib.Commit();
+			Library.Commit();
 		}
 
 		/// <summary>
@@ -182,7 +187,10 @@ public void Commit()
 		/// <returns>A <see cref="ShellItemArray"/> containing the child folders.</returns>
 		public ShellLibraryFolders GetFilteredFolders(LibraryFolderFilter filter = LibraryFolderFilter.AllItems)
 		{
-			return new(_lib, _lib.GetFolders<Shell32.IShellItemArray>((Shell32.LIBRARYFOLDERFILTER)filter));
+			var library = Library;
+			var folders = library.GetFolders<Shell32.IShellItemArray>((Shell32.LIBRARYFOLDERFILTER)filter)
+				?? throw new InvalidOperationException("The shell library did not return its folders.");
+			return new(library, folders);
 		}
 
 		/// <summary>
@@ -196,7 +204,7 @@ public ShellLibraryFolders GetFilteredFolders(LibraryFolderFilter filter = Libra
 		/// <returns>The resulting target location.</returns>
 		public ShellItem ResolveFolder(ShellItem item, TimeSpan timeout)
 		{
-			return Open(_lib.ResolveFolder<Shell32.IShellItem>(item.IShellItem, Convert.ToUInt32(timeout.TotalMilliseconds)));
+			return Open(Library.ResolveFolder<Shell32.IShellItem>(item.IShellItem, Convert.ToUInt32(timeout.TotalMilliseconds)));
 		}
 
 		/// <summary>
@@ -215,7 +223,7 @@ public ShellItem ResolveFolder(ShellItem item, TimeSpan timeout)
 		/// <param name="allowUnindexableLocations">
 		/// If set to <c>true</c> do not display a warning dialog to the user in collisions that concern network locations that cannot be indexed.
 		/// </param>
-		public void ShowLibraryManagementDialog(IWin32Window parentWindow = null, string title = null, string instruction = null, bool allowUnindexableLocations = false)
+		public void ShowLibraryManagementDialog(IWin32Window? parentWindow = null, string? title = null, string? instruction = null, bool allowUnindexableLocations = false)
 		{
 			Shell32.SHShowManageLibraryUI(
 				IShellItem,
diff --git a/src/Files.App/Utils/Shell/ShellLibraryFolders.cs b/src/Files.App/Utils/Shell/ShellLibraryFolders.cs
index ee33126d09c3..013e239d1c75 100644
--- a/src/Files.App/Utils/Shell/ShellLibraryFolders.cs
+++ b/src/Files.App/Utils/Shell/ShellLibraryFolders.cs
@@ -13,7 +13,10 @@ namespace Files.App.Utils.Shell
 	/// <seealso cref="ICollection{ShellItem}"/>
 	public sealed partial class ShellLibraryFolders : ShellItemArray, ICollection<ShellItem>
 	{
-		private Shell32.IShellLibrary _lib;
+		private Shell32.IShellLibrary? _lib;
+
+		private Shell32.IShellLibrary Library
+			=> _lib ?? throw new ObjectDisposedException(nameof(ShellLibraryFolders));
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ShellLibraryFolders"/> class.
@@ -40,7 +43,7 @@ public void Add(ShellItem location)
 		{
 			ArgumentNullException.ThrowIfNull(location);
 
-			_lib.AddFolder(location.IShellItem);
+			Library.AddFolder(location.IShellItem);
 		}
 
 		/// <summary>
@@ -55,7 +58,7 @@ public bool Remove(ShellItem location)
 
 			try
 			{
-				_lib.RemoveFolder(location.IShellItem);
+				Library.RemoveFolder(location.IShellItem);
 
 				return true;
 			}
diff --git a/src/Files.App/Utils/Shell/ShellNewMenuHelper.cs b/src/Files.App/Utils/Shell/ShellNewMenuHelper.cs
index 0e49e2332c3f..f67e9c97c7e2 100644
--- a/src/Files.App/Utils/Shell/ShellNewMenuHelper.cs
+++ b/src/Files.App/Utils/Shell/ShellNewMenuHelper.cs
@@ -38,7 +38,7 @@ public static async Task<List<ShellNewEntry>> GetNewContextMenuEntries()
 			return [.. newMenuItems.OrderBy(item => item.Name)];
 		}
 
-		public static async Task<ShellNewEntry> GetNewContextMenuEntryForType(string extension)
+		public static async Task<ShellNewEntry?> GetNewContextMenuEntryForType(string extension)
 		{
 			if (string.IsNullOrEmpty(extension))
 				return null;
@@ -48,7 +48,7 @@ public static async Task<ShellNewEntry> GetNewContextMenuEntryForType(string ext
 			return key is not null ? await GetShellNewRegistryEntries(key, key) : null;
 		}
 
-		private static async Task<ShellNewEntry> GetShellNewRegistryEntries(RegistryKey current, RegistryKey root)
+		private static async Task<ShellNewEntry?> GetShellNewRegistryEntries(RegistryKey current, RegistryKey root)
 		{
 			try
 			{
@@ -77,7 +77,7 @@ private static async Task<ShellNewEntry> GetShellNewRegistryEntries(RegistryKey
 			return null;
 		}
 
-		private static Task<ShellNewEntry> ParseShellNewRegistryEntry(RegistryKey key, RegistryKey root)
+		private static async Task<ShellNewEntry?> ParseShellNewRegistryEntry(RegistryKey key, RegistryKey root)
 		{
 			var valueNames = key.GetValueNames();
 
@@ -88,14 +88,14 @@ private static Task<ShellNewEntry> ParseShellNewRegistryEntry(RegistryKey key, R
 				!valueNames.Contains("ItemName", StringComparer.OrdinalIgnoreCase) &&
 				!valueNames.Contains("Data", StringComparer.OrdinalIgnoreCase))
 			{
-				return Task.FromResult<ShellNewEntry>(null);
+				return null;
 			}
 
 			var extension = root.Name.Substring(root.Name.LastIndexOf('\\') + 1);
-			var fileName = (string)key.GetValue("FileName");
-			var command = (string)key.GetValue("Command");
+			var fileName = key.GetValue("FileName") as string;
+			var command = key.GetValue("Command") as string;
 
-			byte[] data = null;
+			byte[]? data = null;
 			var dataObj = key.GetValue("Data");
 
 			if (dataObj is not null)
@@ -108,7 +108,7 @@ private static Task<ShellNewEntry> ParseShellNewRegistryEntry(RegistryKey key, R
 				};
 			}
 
-			return CreateShellNewEntry(extension, fileName, command, data);
+			return await CreateShellNewEntry(extension, fileName, command, data);
 		}
 
 		private static async Task<ShellNewEntry> CreateShellNewEntry(string extension, string? fileName, string? command, byte[]? data)
@@ -119,7 +119,7 @@ private static async Task<ShellNewEntry> CreateShellNewEntry(string extension, s
 			var displayType = sampleFile is not null ? sampleFile.DisplayType : $"file {extension}";
 			var thumbnail = sampleFile is not null ? await SafetyExtensions.IgnoreExceptions(() => sampleFile.GetThumbnailAsync(Windows.Storage.FileProperties.ThumbnailMode.ListView, 24, Windows.Storage.FileProperties.ThumbnailOptions.UseCurrentScale).AsTask()) : null;
 
-			string iconString = null;
+			string? iconString = null;
 
 			if (thumbnail is not null)
 			{
@@ -142,7 +142,7 @@ private static async Task<ShellNewEntry> CreateShellNewEntry(string extension, s
 			return entry;
 		}
 
-		private static RegistryKey OpenSubKeySafe(this RegistryKey root, string keyName)
+		private static RegistryKey? OpenSubKeySafe(this RegistryKey root, string keyName)
 		{
 			try
 			{
diff --git a/src/Files.App/Utils/Shell/ThreadWithMessageQueue.cs b/src/Files.App/Utils/Shell/ThreadWithMessageQueue.cs
index 755fb4c3229d..a392cc6cf56f 100644
--- a/src/Files.App/Utils/Shell/ThreadWithMessageQueue.cs
+++ b/src/Files.App/Utils/Shell/ThreadWithMessageQueue.cs
@@ -7,7 +7,7 @@ namespace Files.App.Utils.Shell
 {
 	public sealed partial class ThreadWithMessageQueue : Disposable
 	{
-		private readonly BlockingCollection<Internal> messageQueue;
+		private readonly BlockingCollection<IInternal> messageQueue;
 
 		private readonly Thread thread;
 
@@ -21,33 +21,30 @@ protected override void Dispose(bool disposing)
 			}
 		}
 
-		public async Task<V> PostMethod<V>(Func<object> payload)
+		public Task<V> PostMethod<V>(Func<V> payload)
 		{
-			var message = new Internal(payload);
+			var message = new Internal<V>(payload);
 			messageQueue.TryAdd(message);
 
-			return (V)await message.tcs.Task;
+			return message.Task;
 		}
 
 		public Task PostMethod(Action payload)
 		{
-			var message = new Internal(payload);
+			var message = new ActionInternal(payload);
 			messageQueue.TryAdd(message);
 
-			return message.tcs.Task;
+			return message.Task;
 		}
 
 		public ThreadWithMessageQueue()
 		{
-			messageQueue = new BlockingCollection<Internal>(new ConcurrentQueue<Internal>());
+			messageQueue = new BlockingCollection<IInternal>(new ConcurrentQueue<IInternal>());
 
 			thread = new Thread(new ThreadStart(() =>
 			{
 				foreach (var message in messageQueue.GetConsumingEnumerable())
-				{
-					var res = message.payload();
-					message.tcs.SetResult(res);
-				}
+					message.Invoke();
 			}));
 
 			thread.SetApartmentState(ApartmentState.STA);
@@ -58,22 +55,47 @@ public ThreadWithMessageQueue()
 			thread.Start();
 		}
 
-		private sealed class Internal
+		private interface IInternal
 		{
-			public Func<object?> payload;
+			void Invoke();
+		}
+
+		private sealed class Internal<T> : IInternal
+		{
+			private readonly Func<T> payload;
+			private readonly TaskCompletionSource<T> taskCompletionSource =
+				new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+			public Task<T> Task => taskCompletionSource.Task;
 
-			public TaskCompletionSource<object> tcs;
+			public Internal(Func<T> payload)
+			{
+				this.payload = payload;
+			}
 
-			public Internal(Action payload)
+			public void Invoke()
 			{
-				this.payload = () => { payload(); return default; };
-				tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+				taskCompletionSource.SetResult(payload());
 			}
+		}
+
+		private sealed class ActionInternal : IInternal
+		{
+			private readonly Action payload;
+			private readonly TaskCompletionSource taskCompletionSource =
+				new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+			public Task Task => taskCompletionSource.Task;
 
-			public Internal(Func<object?> payload)
+			public ActionInternal(Action payload)
 			{
 				this.payload = payload;
-				tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+			}
+
+			public void Invoke()
+			{
+				payload();
+				taskCompletionSource.SetResult();
 			}
 		}
 	}
diff --git a/src/Files.App/Utils/StatusCenter/StatusCenterHelper.cs b/src/Files.App/Utils/StatusCenter/StatusCenterHelper.cs
index 8605bdd12415..85f2c063a5e1 100644
--- a/src/Files.App/Utils/StatusCenter/StatusCenterHelper.cs
+++ b/src/Files.App/Utils/StatusCenter/StatusCenterHelper.cs
@@ -645,7 +645,7 @@ public static void UpdateCardStrings(StatusCenterItem card, StatusCenterItemProg
 			{
 				case FileOperationType.Copy:
 					{
-						string headerResource = card.HeaderStringResource;
+						string? headerResource = card.HeaderStringResource;
 
 						if (card.IsDiscovering && card.TotalItemsCount > 0 && card.IsInProgress)
 							headerResource = "StatusCenter_CopyDiscovery_Header";
@@ -664,7 +664,7 @@ public static void UpdateCardStrings(StatusCenterItem card, StatusCenterItemProg
 					}
 				case FileOperationType.Move:
 					{
-						string headerResource = card.HeaderStringResource;
+						string? headerResource = card.HeaderStringResource;
 
 						if (card.IsDiscovering && card.TotalItemsCount > 0 && card.IsInProgress)
 							headerResource = "StatusCenter_CopyDiscovery_Header";
@@ -683,7 +683,7 @@ public static void UpdateCardStrings(StatusCenterItem card, StatusCenterItemProg
 					}
 				case FileOperationType.Delete:
 					{
-						string headerResource = card.HeaderStringResource;
+						string? headerResource = card.HeaderStringResource;
 
 						if (card.IsDiscovering && card.TotalItemsCount > 0 && card.IsInProgress)
 							headerResource = "StatusCenter_CopyDiscovery_Header";
diff --git a/src/Files.App/Utils/Storage/Collection/BlockingListEnumerator.cs b/src/Files.App/Utils/Storage/Collection/BlockingListEnumerator.cs
index 3c85449fc585..13ef93aa7a0f 100644
--- a/src/Files.App/Utils/Storage/Collection/BlockingListEnumerator.cs
+++ b/src/Files.App/Utils/Storage/Collection/BlockingListEnumerator.cs
@@ -9,7 +9,7 @@ public sealed class BlockingListEnumerator<T> : IEnumerator<T>
 
 		private readonly object m_Lock;
 
-		private T m_Current;
+		private T m_Current = default!;
 
 		private int m_Pos;
 
@@ -22,7 +22,7 @@ public T Current
 			}
 		}
 
-		object IEnumerator.Current
+		object? IEnumerator.Current
 			=> Current;
 
 		public BlockingListEnumerator(IList<T> inner, object @lock)
diff --git a/src/Files.App/Utils/Storage/Collection/BulkConcurrentObservableCollection.cs b/src/Files.App/Utils/Storage/Collection/BulkConcurrentObservableCollection.cs
index dbf52a68687c..43f832198864 100644
--- a/src/Files.App/Utils/Storage/Collection/BulkConcurrentObservableCollection.cs
+++ b/src/Files.App/Utils/Storage/Collection/BulkConcurrentObservableCollection.cs
@@ -81,9 +81,9 @@ public T this[int index]
 
 		public event PropertyChangedEventHandler? PropertyChanged;
 
-		private Func<T, string>? itemGroupKeySelector;
+		private Func<T, string?>? itemGroupKeySelector;
 
-		public Func<T, string>? ItemGroupKeySelector
+		public Func<T, string?>? ItemGroupKeySelector
 		{
 			get => itemGroupKeySelector;
 			set
diff --git a/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs b/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs
index 9466d24ced31..d9aa3fce60fc 100644
--- a/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs
+++ b/src/Files.App/Utils/Storage/Collection/GroupedCollection.cs
@@ -5,7 +5,12 @@ namespace Files.App.Utils.Storage
 {
 	public sealed class GroupedCollection<T> : BulkConcurrentObservableCollection<T>, IGroupedCollectionHeader
 	{
-		public GroupedHeaderViewModel Model { get; set; }
+		private GroupedHeaderViewModel? model;
+		public GroupedHeaderViewModel Model
+		{
+			get => model ?? throw new InvalidOperationException("The group header model has not been initialized.");
+			set => model = value;
+		}
 
 		public GroupedCollection(IEnumerable<T> items) : base(items)
 		{
@@ -37,7 +42,7 @@ private void AddEvents()
 			PropertyChanged += GroupedCollection_PropertyChanged;
 		}
 
-		private void GroupedCollection_PropertyChanged(object sender, PropertyChangedEventArgs e)
+		private void GroupedCollection_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName == nameof(Count))
 			{
diff --git a/src/Files.App/Utils/Storage/Collection/GroupedHeaderViewModel.cs b/src/Files.App/Utils/Storage/Collection/GroupedHeaderViewModel.cs
index dff592522bef..d34daf0d53c3 100644
--- a/src/Files.App/Utils/Storage/Collection/GroupedHeaderViewModel.cs
+++ b/src/Files.App/Utils/Storage/Collection/GroupedHeaderViewModel.cs
@@ -2,35 +2,37 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml.Media;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
 namespace Files.App.Utils.Storage
 {
 	public sealed partial class GroupedHeaderViewModel : ObservableObject
 	{
-		public string Key { get; set; }
+		public string? Key { get; set; }
 		public bool Initialized { get; set; }
 		public int SortIndexOverride { get; set; }
 
-		private string text;
+		private string? text;
 
+		[AllowNull]
 		public string Text
 		{
 			get => text ?? ""; // Text is bound to AutomationProperties.Name and can't be null
 			set => SetPropertyWithUpdateDelay(ref text, value);
 		}
 
-		private string subtext;
+		private string? subtext;
 
-		public string Subtext
+		public string? Subtext
 		{
 			get => subtext;
 			set => SetPropertyWithUpdateDelay(ref subtext, value);
 		}
 
-		private string countText;
+		private string? countText;
 
-		public string CountText
+		public string? CountText
 		{
 			get => countText;
 			set => SetPropertyWithUpdateDelay(ref countText, value);
@@ -44,23 +46,23 @@ public bool ShowCountTextBelow
 			set => SetProperty(ref showCountTextBelow, value);
 		}
 
-		private ImageSource imageSource;
+		private ImageSource? imageSource;
 
-		public ImageSource ImageSource
+		public ImageSource? ImageSource
 		{
 			get => imageSource;
 			set => SetPropertyWithUpdateDelay(ref imageSource, value);
 		}
 
-		private string icon;
+		private string? icon;
 
-		public string Icon
+		public string? Icon
 		{
 			get => icon;
 			set => SetPropertyWithUpdateDelay(ref icon, value);
 		}
 
-		private void SetPropertyWithUpdateDelay<T>(ref T field, T newVal, [CallerMemberName] string propName = null)
+		private void SetPropertyWithUpdateDelay<T>(ref T field, T newVal, [CallerMemberName] string? propName = null)
 		{
 			if (propName is null)
 			{
diff --git a/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs b/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs
index ef91971c8cf6..ee190ef5d247 100644
--- a/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs
+++ b/src/Files.App/Utils/Storage/Collection/GroupingHelper.cs
@@ -7,13 +7,15 @@ namespace Files.App.Utils.Storage
 {
 	public static class GroupingHelper
 	{
-		private static readonly IDateTimeFormatter dateTimeFormatter = Ioc.Default.GetService<IDateTimeFormatter>();
+		private static readonly IDateTimeFormatter dateTimeFormatter = Ioc.Default.GetRequiredService<IDateTimeFormatter>();
 
-		public static Func<ListedItem, string> GetItemGroupKeySelector(GroupOption option, GroupByDateUnit unit)
+		public static Func<ListedItem, string?>? GetItemGroupKeySelector(GroupOption option, GroupByDateUnit unit)
 		{
 			return option switch
 			{
-				GroupOption.Name => x => new string(x.Name.Take(1).ToArray()).ToUpperInvariant(),
+				GroupOption.Name => x => new string((x.Name
+					?? throw new InvalidOperationException("The grouped item does not have a name."))
+					.Take(1).ToArray()).ToUpperInvariant(),
 				GroupOption.Size => x => x.PrimaryItemAttribute != StorageItemTypes.Folder || x.IsArchive ? GetGroupSizeKey(x.FileSizeBytes) : x.FileSizeDisplay,
 				GroupOption.DateCreated => x => dateTimeFormatter.ToTimeSpanLabel(x.ItemDateCreatedReal, unit).Text,
 				GroupOption.DateModified => x => dateTimeFormatter.ToTimeSpanLabel(x.ItemDateModifiedReal, unit).Text,
@@ -22,12 +24,12 @@ public static Func<ListedItem, string> GetItemGroupKeySelector(GroupOption optio
 				GroupOption.FileTag => x => x.FileTags?.FirstOrDefault() ?? "Untagged",
 				GroupOption.OriginalFolder => x => (x as RecycleBinItem)?.ItemOriginalFolder,
 				GroupOption.DateDeleted => x => dateTimeFormatter.ToTimeSpanLabel((x as RecycleBinItem)?.ItemDateDeletedReal ?? DateTimeOffset.Now, unit).Text,
-				GroupOption.FolderPath => x => PathNormalization.GetParentDir(x.ItemPath.TrimPath()),
+				GroupOption.FolderPath => x => PathNormalization.GetParentDir(x.GetRequiredPath().TrimPath()),
 				_ => null,
 			};
 		}
 
-		public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<ListedItem>>) GetGroupInfoSelector(GroupOption option, GroupByDateUnit unit)
+		public static (Action<GroupedCollection<ListedItem>>?, Action<GroupedCollection<ListedItem>>?) GetGroupInfoSelector(GroupOption option, GroupByDateUnit unit)
 		{
 			return option switch
 			{
@@ -85,12 +87,12 @@ public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<L
 					ListedItem first = x.First();
 					x.Model.ShowCountTextBelow = true;
 					x.Model.Text = first.SyncStatusString;
-					x.Model.Icon = first?.SyncStatusUI.Glyph;
+					x.Model.Icon = first.SyncStatusUI.Glyph;
 				}, null),
 
 				GroupOption.FileTag => (x =>
 				{
-					ListedItem first = x.FirstOrDefault();
+					ListedItem first = x.First();
 					x.Model.ShowCountTextBelow = true;
 					x.Model.Text = first.FileTagsUI?.FirstOrDefault()?.Name ?? Strings.Untagged.GetLocalizedResource();
 					//x.Model.Icon = first.FileTagsUI?.FirstOrDefault()?.Color;
@@ -99,9 +101,9 @@ public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<L
 				GroupOption.DateDeleted => (x =>
 					{
 						var vals = dateTimeFormatter.ToTimeSpanLabel((x.First() as RecycleBinItem)?.ItemDateDeletedReal ?? DateTimeOffset.Now, unit);
-						x.Model.Subtext = vals?.Text;
-						x.Model.Icon = vals?.Glyph;
-						x.Model.SortIndexOverride = vals?.Index ?? 0;
+						x.Model.Subtext = vals.Text;
+						x.Model.Icon = vals.Glyph;
+						x.Model.SortIndexOverride = vals.Index;
 					}, null),
 
 				GroupOption.OriginalFolder => (x =>
@@ -119,7 +121,7 @@ public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<L
 					ListedItem first = x.First();
 					var model = x.Model;
 					model.ShowCountTextBelow = true;
-					var parentPath = PathNormalization.GetParentDir(first.ItemPath.TrimPath());
+					var parentPath = PathNormalization.GetParentDir(first.GetRequiredPath().TrimPath());
 					model.Text = GetFolderName(parentPath);
 					model.Subtext = parentPath;
 				}, null),
@@ -166,10 +168,11 @@ private static readonly (long size, string text, string sizeText)[] sizeGroups =
 			(16000, Strings.ItemSizeText_Small.GetLocalizedResource(), "16 KiB".ConvertSizeAbbreviation()),
 		];
 
-		private static string GetFolderName(string path)
+		private static string? GetFolderName(string? path)
 		{
-			if (path == null)
+			if (path is null)
 				return null;
+
 			return path.Substring(path.LastIndexOf('\\') + 1);
 		}
 	}
diff --git a/src/Files.App/Utils/Storage/Collection/IGroupableItem.cs b/src/Files.App/Utils/Storage/Collection/IGroupableItem.cs
index ed95075a29eb..d689a2e09a2f 100644
--- a/src/Files.App/Utils/Storage/Collection/IGroupableItem.cs
+++ b/src/Files.App/Utils/Storage/Collection/IGroupableItem.cs
@@ -5,6 +5,6 @@ namespace Files.App.Utils.Storage
 {
 	public interface IGroupableItem
 	{
-		public string Key { get; set; }
+		public string? Key { get; set; }
 	}
 }
diff --git a/src/Files.App/Utils/Storage/Collection/SortingHelper.cs b/src/Files.App/Utils/Storage/Collection/SortingHelper.cs
index b816829c809d..07e727fafc5d 100644
--- a/src/Files.App/Utils/Storage/Collection/SortingHelper.cs
+++ b/src/Files.App/Utils/Storage/Collection/SortingHelper.cs
@@ -7,10 +7,10 @@ namespace Files.App.Utils.Storage
 {
 	public static class SortingHelper
 	{
-		private static object OrderByNameFunc(ListedItem item)
+		private static object? OrderByNameFunc(ListedItem item)
 			=> item.Name;
 
-		public static Func<ListedItem, object> GetSortFunc(SortOption directorySortOption)
+		public static Func<ListedItem, object?> GetSortFunc(SortOption directorySortOption)
 		{
 			return directorySortOption switch
 			{
diff --git a/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs b/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs
index d369d0adc375..db19b221a2cc 100644
--- a/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs
+++ b/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs
@@ -12,7 +12,7 @@ namespace Files.App.Utils.Storage
 {
 	public static class UniversalStorageEnumerator
 	{
-		private static readonly ISizeProvider folderSizeProvider = Ioc.Default.GetService<ISizeProvider>();
+		private static readonly ISizeProvider folderSizeProvider = Ioc.Default.GetRequiredService<ISizeProvider>();
 
 		private static readonly IIconCacheService iconCacheService = Ioc.Default.GetRequiredService<IIconCacheService>();
 
@@ -22,7 +22,7 @@ public static async Task<List<ListedItem>> ListEntries(
 			CancellationToken cancellationToken,
 			int countLimit,
 			Func<List<ListedItem>, Task> intermediateAction,
-			Dictionary<string, BitmapImage> defaultIconPairs = null)
+			Dictionary<string, BitmapImage>? defaultIconPairs = null)
 		{
 			var sampler = new IntervalSampler(500);
 			var tempList = new List<ListedItem>();
@@ -87,9 +87,10 @@ ex is FileNotFoundException ||
 					{
 						if (item.IsOfType(StorageItemTypes.Folder))
 						{
-							var folder = await AddFolderAsync(item.AsBaseStorageFolder(), currentStorageFolder, cancellationToken);
+							var folder = await AddFolderAsync(item.AsBaseStorageFolder()!, currentStorageFolder, cancellationToken);
 							if (folder is not null)
 							{
+								var folderPath = folder.ItemPath!;
 								folder.PreloadedIconData = await iconCacheService.GetIconAsync(folder.ItemPath, null, true);
 
 								if (defaultIconPairs?.ContainsKey(string.Empty) ?? false)
@@ -99,21 +100,21 @@ ex is FileNotFoundException ||
 
 								// The size provider enumerates with Win32, which reports size 0 for
 								// virtual paths (ftp, archives) it cannot traverse; skip those
-								if (calculateFolderSizes && FolderHelpers.CheckFolderAccessWithWin32(folder.ItemPath))
+								if (calculateFolderSizes && FolderHelpers.CheckFolderAccessWithWin32(folderPath))
 								{
-									if (folderSizeProvider.TryGetSize(folder.ItemPath, out var size))
+									if (folderSizeProvider.TryGetSize(folderPath, out var size))
 									{
 										folder.FileSizeBytes = (long)size;
 										folder.FileSize = size.ToSizeString();
 									}
 
-									_ = folderSizeProvider.UpdateAsync(folder.ItemPath, cancellationToken);
+									_ = folderSizeProvider.UpdateAsync(folderPath, cancellationToken);
 								}
 							}
 						}
 						else
 						{
-							var fileEntry = await AddFileAsync(item.AsBaseStorageFile(), currentStorageFolder, cancellationToken);
+							var fileEntry = await AddFileAsync(item.AsBaseStorageFile()!, currentStorageFolder, cancellationToken);
 							if (fileEntry is not null)
 							{
 								fileEntry.PreloadedIconData = await iconCacheService.GetIconAsync(fileEntry.ItemPath, fileEntry.FileExtension, false);
@@ -161,7 +162,7 @@ private static async Task<IReadOnlyList<IStorageItem>> EnumerateFileByFile(BaseS
 
 			for (var i = startFrom; i < startFrom + itemsToIterate; i++)
 			{
-				IStorageItem item;
+				IStorageItem? item;
 				try
 				{
 					var results = await rootFolder.GetItemsAsync(i, 1);
@@ -193,9 +194,9 @@ ex is FileNotFoundException ||
 			return tempList;
 		}
 
-		public static async Task<ListedItem> AddFolderAsync(
+		public static async Task<ListedItem?> AddFolderAsync(
 			BaseStorageFolder folder,
-			StorageFolderWithPath currentStorageFolder,
+			StorageFolderWithPath? currentStorageFolder,
 			CancellationToken cancellationToken)
 		{
 			var basicProperties = await folder.GetBasicPropertiesAsync();
@@ -237,7 +238,7 @@ public static async Task<ListedItem> AddFolderAsync(
 						Opacity = 1,
 						FileImage = null,
 						LoadFileIcon = false,
-						ItemPath = string.IsNullOrEmpty(folder.Path) ? PathNormalization.Combine(currentStorageFolder.Path, folder.Name) : folder.Path,
+						ItemPath = string.IsNullOrEmpty(folder.Path) ? PathNormalization.Combine(currentStorageFolder!.Path, folder.Name) : folder.Path,
 						FileSize = basicProperties.Size.ToSizeString(),
 						FileSizeBytes = (long)basicProperties.Size,
 						ItemDateDeletedReal = binFolder.DateDeleted,
@@ -257,7 +258,7 @@ public static async Task<ListedItem> AddFolderAsync(
 						Opacity = 1,
 						FileImage = null,
 						LoadFileIcon = false,
-						ItemPath = string.IsNullOrEmpty(folder.Path) ? PathNormalization.Combine(currentStorageFolder.Path, folder.Name) : folder.Path,
+						ItemPath = string.IsNullOrEmpty(folder.Path) ? PathNormalization.Combine(currentStorageFolder!.Path, folder.Name) : folder.Path,
 						FileSize = null,
 						FileSizeBytes = 0
 					};
@@ -267,9 +268,9 @@ public static async Task<ListedItem> AddFolderAsync(
 			return null;
 		}
 
-		public static async Task<ListedItem> AddFileAsync(
+		public static async Task<ListedItem?> AddFileAsync(
 			BaseStorageFile file,
-			StorageFolderWithPath currentStorageFolder,
+			StorageFolderWithPath? currentStorageFolder,
 			CancellationToken cancellationToken)
 		{
 			var basicProperties = await file.GetBasicPropertiesAsync();
@@ -277,7 +278,7 @@ public static async Task<ListedItem> AddFileAsync(
 			var itemName = file.Name;
 			var itemModifiedDate = basicProperties.DateModified;
 			var itemCreatedDate = file.DateCreated;
-			var itemPath = string.IsNullOrEmpty(file.Path) ? PathNormalization.Combine(currentStorageFolder.Path, file.Name) : file.Path;
+			var itemPath = string.IsNullOrEmpty(file.Path) ? PathNormalization.Combine(currentStorageFolder!.Path, file.Name) : file.Path;
 			var itemSize = basicProperties.Size.ToSizeString();
 			var itemSizeBytes = basicProperties.Size;
 			var itemType = file.DisplayType;
@@ -288,7 +289,7 @@ public static async Task<ListedItem> AddFileAsync(
 				return null;
 
 			// TODO: is this needed to be handled here?
-			if (App.LibraryManager.TryGetLibrary(file.Path, out LibraryLocationItem library))
+			if (App.LibraryManager.TryGetLibrary(file.Path, out var library))
 			{
 				return new LibraryItem(library)
 				{
diff --git a/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs b/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs
index 1f02afcfd36a..00435a95c3b6 100644
--- a/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs
+++ b/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs
@@ -11,7 +11,7 @@ namespace Files.App.Utils.Storage
 {
 	public static class Win32StorageEnumerator
 	{
-		private static readonly ISizeProvider folderSizeProvider = Ioc.Default.GetService<ISizeProvider>();
+		private static readonly ISizeProvider folderSizeProvider = Ioc.Default.GetRequiredService<ISizeProvider>();
 		private static readonly IStorageCacheService fileListCache = Ioc.Default.GetRequiredService<IStorageCacheService>();
 
 		private static readonly string folderTypeTextLocalized = Strings.Folder.GetLocalizedResource();
@@ -55,13 +55,14 @@ Func<List<ListedItem>, Task> intermediateAction
 						var file = await GetFile(findData, path, isGitRepo, cancellationToken);
 						if (file is not null)
 						{
+							var filePath = file.ItemPath!;
 							file.PreloadedIconData = await iconCacheService.GetIconAsync(file.ItemPath, file.FileExtension, false);
 							tempList.Add(file);
 							++count;
 
 							if (areAlternateStreamsVisible)
 							{
-								tempList.AddRange(EnumAdsForPath(file.ItemPath, file));
+								tempList.AddRange(EnumAdsForPath(filePath, file));
 							}
 						}
 					}
@@ -72,22 +73,23 @@ Func<List<ListedItem>, Task> intermediateAction
 							var folder = await GetFolder(findData, path, isGitRepo, cancellationToken);
 							if (folder is not null)
 							{
+								var folderPath = folder.ItemPath!;
 								folder.PreloadedIconData = await iconCacheService.GetIconAsync(folder.ItemPath, null, true);
 								tempList.Add(folder);
 								++count;
 
 								if (areAlternateStreamsVisible)
-									tempList.AddRange(EnumAdsForPath(folder.ItemPath, folder));
+									tempList.AddRange(EnumAdsForPath(folderPath, folder));
 
 								if (CalculateFolderSizes)
 								{
-									if (folderSizeProvider.TryGetSize(folder.ItemPath, out var size))
+									if (folderSizeProvider.TryGetSize(folderPath, out var size))
 									{
 										folder.FileSizeBytes = (long)size;
 										folder.FileSize = size.ToSizeString();
 									}
 
-									_ = folderSizeProvider.UpdateAsync(folder.ItemPath, cancellationToken);
+									_ = folderSizeProvider.UpdateAsync(folderPath, cancellationToken);
 								}
 							}
 						}
@@ -120,12 +122,12 @@ private static IEnumerable<ListedItem> EnumAdsForPath(string itemPath, ListedIte
 		public static ListedItem GetAlternateStream((string Name, long Size) ads, ListedItem main)
 		{
 			string itemType = Strings.File.GetLocalizedResource();
-			string itemFileExtension = null;
+			string? itemFileExtension = null;
 
 			if (ads.Name.Contains('.'))
 			{
 				itemFileExtension = Path.GetExtension(ads.Name);
-				itemType = itemFileExtension.Trim('.') + " " + itemType;
+				itemType = itemFileExtension!.Trim('.') + " " + itemType;
 			}
 
 			string adsName = ads.Name.Substring(1, ads.Name.Length - 7); // Remove ":" and ":$DATA"
@@ -149,7 +151,7 @@ public static ListedItem GetAlternateStream((string Name, long Size) ads, Listed
 			};
 		}
 
-		public static async Task<ListedItem> GetFolder(
+		public static async Task<ListedItem?> GetFolder(
 			Win32PInvoke.WIN32_FIND_DATA findData,
 			string pathRoot,
 			bool isGitRepo,
@@ -226,7 +228,7 @@ CancellationToken cancellationToken
 			}
 		}
 
-		public static async Task<ListedItem> GetFile(
+		public static async Task<ListedItem?> GetFile(
 			Win32PInvoke.WIN32_FIND_DATA findData,
 			string pathRoot,
 			bool isGitRepo,
@@ -258,16 +260,15 @@ CancellationToken cancellationToken
 			long itemSizeBytes = findData.GetSize();
 			var itemSize = itemSizeBytes.ToSizeString();
 			string itemType = Strings.File.GetLocalizedResource();
-			string itemFileExtension = null;
+			string? itemFileExtension = null;
 
 			if (findData.cFileName.Contains('.'))
 			{
 				itemFileExtension = Path.GetExtension(itemPath);
-				itemType = itemFileExtension.Trim('.') + " " + itemType;
+				itemType = itemFileExtension!.Trim('.') + " " + itemType;
 			}
 
 			bool itemThumbnailImgVis = false;
-			bool itemEmptyImgVis = true;
 
 			if (cancellationToken.IsCancellationRequested)
 				return null;
@@ -388,7 +389,7 @@ CancellationToken cancellationToken
 					};
 				}
 			}
-			else if (App.LibraryManager.TryGetLibrary(itemPath, out LibraryLocationItem library))
+			else if (App.LibraryManager.TryGetLibrary(itemPath, out var library))
 			{
 				return new LibraryItem(library)
 				{
diff --git a/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs b/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs
index 654e15cf5c87..e1d4c36e040f 100644
--- a/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs
+++ b/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs
@@ -24,7 +24,7 @@ public static async Task<bool> CheckEmptyDrive(string? drivePath)
 				return false;
 			var drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
-			var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => drivePath.StartsWith(x.Path, StringComparison.Ordinal));
+			var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => drivePath.StartsWith(x.Path!, StringComparison.Ordinal));
 			if (matchingDrive is null || matchingDrive.Type != Data.Items.DriveType.CDRom || matchingDrive.MaxSpace != ByteSizeLib.ByteSize.FromBytes(0))
 				return false;
 
@@ -34,11 +34,11 @@ public static async Task<bool> CheckEmptyDrive(string? drivePath)
 				Strings.InsertDiscDialog_OpenDriveButton.GetLocalizedResource(),
 				Strings.Close.GetLocalizedResource());
 			if (ejectButton)
-				EjectDeviceAsync(matchingDrive.Path);
+				EjectDeviceAsync(matchingDrive.Path!);
 			return true;
 		}
 
-		public static async Task<StorageFolderWithPath> GetRootFromPathAsync(string devicePath)
+		public static async Task<StorageFolderWithPath?> GetRootFromPathAsync(string? devicePath)
 		{
 			if (!SystemIO.Path.IsPathRooted(devicePath))
 				return null;
@@ -46,10 +46,13 @@ public static async Task<StorageFolderWithPath> GetRootFromPathAsync(string devi
 			var drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
 			var rootPath = SystemIO.Path.GetPathRoot(devicePath);
+			if (rootPath is null)
+				return null;
+
 			if (devicePath.StartsWith(@"\\?\", StringComparison.Ordinal)) // USB device
 			{
 				// Check among already discovered drives
-				StorageFolder matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x =>
+				StorageFolder? matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x =>
 					Helpers.PathNormalization.NormalizePath(x.Path) == Helpers.PathNormalization.NormalizePath(rootPath))?.Root;
 				if (matchingDrive is null)
 				{
@@ -175,8 +178,8 @@ public static unsafe string GetExtendedDriveLabel(SystemIO.DriveInfo drive)
 			}) ?? "";
 		}
 
-		public static async Task<StorageItemThumbnail> GetThumbnailAsync(StorageFolder folder)
-			=> (StorageItemThumbnail)await FilesystemTasks.Wrap(()
+		public static async Task<StorageItemThumbnail?> GetThumbnailAsync(StorageFolder folder)
+			=> await FilesystemTasks.Wrap(()
 				=> folder.GetThumbnailAsync(ThumbnailMode.SingleItem, 40, ThumbnailOptions.UseCurrentScale).AsTask()
 			);
 	}
diff --git a/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs b/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs
index 72f04e297c70..b61748f24869 100644
--- a/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs
+++ b/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs
@@ -12,7 +12,7 @@ public static class FileThumbnailHelper
 		/// <summary>
 		/// Returns icon or thumbnail for given file or folder
 		/// </summary>
-		public static async Task<byte[]?> GetIconAsync(string path, uint requestedSize, bool isFolder, IconOptions iconOptions)
+		public static async Task<byte[]?> GetIconAsync(string? path, uint requestedSize, bool isFolder, IconOptions iconOptions)
 		{
 			var size = iconOptions.HasFlag(IconOptions.UseCurrentScale) ? requestedSize * App.AppModel.AppWindowDPI : requestedSize;
 			// Ensure size is at least 1 to prevent layout errors
@@ -23,13 +23,13 @@ public static class FileThumbnailHelper
 				var extension = Path.GetExtension(path);
 
 				//Restrict to only %windir%\fonts
-				if (FileExtensionHelpers.IsFontFile(extension) && PathHelpers.IsInSystemFontsFolder(path))
+				if (FileExtensionHelpers.IsFontFile(extension) && path is not null && PathHelpers.IsInSystemFontsFolder(path))
 				{
 					var winrtThumbnail = await FontFileHelper.GetWinRTThumbnailAsync(path, (uint)size);
 					if (winrtThumbnail is not null)
 						return winrtThumbnail;
 
-					if (!extension.Equals(".fon", StringComparison.OrdinalIgnoreCase))
+					if (!string.Equals(extension, ".fon", StringComparison.OrdinalIgnoreCase))
 					{
 						var fontThumbnail = await STATask.Run(() => FontFileHelper.GenerateFontThumbnail(path, (int)size), App.Logger);
 						if (fontThumbnail is not null)
@@ -51,7 +51,7 @@ public static class FileThumbnailHelper
 		/// <param name="path"></param>
 		/// <param name="isFolder"></param>
 		/// <returns></returns>
-		public static async Task<byte[]?> GetIconOverlayAsync(string path, bool isFolder)
+		public static async Task<byte[]?> GetIconOverlayAsync(string? path, bool isFolder)
 			=> await STATask.Run(() => Win32Helper.GetIconOverlay(path, isFolder), App.Logger);
 
 		[Obsolete]
@@ -61,4 +61,4 @@ public static class FileThumbnailHelper
 			return result;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/Helpers/FilesystemResult.cs b/src/Files.App/Utils/Storage/Helpers/FilesystemResult.cs
index ccb51f9209c8..c6a0eb1dfdc8 100644
--- a/src/Files.App/Utils/Storage/Helpers/FilesystemResult.cs
+++ b/src/Files.App/Utils/Storage/Helpers/FilesystemResult.cs
@@ -14,20 +14,20 @@ public class FilesystemResult
 		public static implicit operator FileSystemStatusCode(FilesystemResult res) => res.ErrorCode;
 		public static implicit operator FilesystemResult(FileSystemStatusCode res) => new(res);
 
-		public static implicit operator bool(FilesystemResult res) => res?.ErrorCode is FileSystemStatusCode.Success;
+		public static implicit operator bool(FilesystemResult? res) => res?.ErrorCode is FileSystemStatusCode.Success;
 		public static explicit operator FilesystemResult(bool res) => new(res ? FileSystemStatusCode.Success : FileSystemStatusCode.Generic);
 
 
-		public static implicit operator BOOL(FilesystemResult res) => res?.ErrorCode is FileSystemStatusCode.Success;
+		public static implicit operator BOOL(FilesystemResult? res) => res?.ErrorCode is FileSystemStatusCode.Success;
 		public static explicit operator FilesystemResult(BOOL res) => new(res ? FileSystemStatusCode.Success : FileSystemStatusCode.Generic);
 	}
 
 	public sealed class FilesystemResult<T> : FilesystemResult
 	{
-		public T Result { get; }
+		public T? Result { get; }
 
-		public FilesystemResult(T result, FileSystemStatusCode errorCode) : base(errorCode) => Result = result;
+		public FilesystemResult(T? result, FileSystemStatusCode errorCode) : base(errorCode) => Result = result;
 
-		public static implicit operator T(FilesystemResult<T> res) => res.Result;
+		public static implicit operator T?(FilesystemResult<T> res) => res.Result;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/Helpers/FilesystemTasks.cs b/src/Files.App/Utils/Storage/Helpers/FilesystemTasks.cs
index 924845641754..787375311f17 100644
--- a/src/Files.App/Utils/Storage/Helpers/FilesystemTasks.cs
+++ b/src/Files.App/Utils/Storage/Helpers/FilesystemTasks.cs
@@ -48,36 +48,43 @@ public async static Task<FilesystemResult<T>> Wrap<T>(Func<Task<T>> wrapped)
 			}
 		}
 
-		public async static Task<FilesystemResult> OnSuccess<T>(this Task<FilesystemResult<T>> wrapped, Action<T> func)
+		public async static Task<FilesystemResult<T>> WrapNullable<T>(Func<Task<T?>> wrapped)
+			where T : class
+		{
+			try
+			{
+				return new FilesystemResult<T>(await wrapped(), FileSystemStatusCode.Success);
+			}
+			catch (Exception ex)
+			{
+				return new FilesystemResult<T>(default, GetErrorCode(ex, typeof(T)));
+			}
+		}
+
+		public async static Task<FilesystemResult> OnSuccess<T>(this Task<FilesystemResult<T>> wrapped, Action<T?> func)
 		{
 			var res = await wrapped;
 			if (res)
-			{
 				func(res.Result);
-			}
 			return res;
 		}
-		public async static Task<FilesystemResult> OnSuccess<T>(this Task<FilesystemResult<T>> wrapped, Func<T, Task> func)
+		public async static Task<FilesystemResult> OnSuccess<T>(this Task<FilesystemResult<T>> wrapped, Func<T?, Task> func)
 		{
 			var res = await wrapped;
 			if (res)
-			{
 				return await Wrap(() => func(res.Result));
-			}
 			return res;
 		}
-		public async static Task<FilesystemResult<V>> OnSuccess<V, T>(this Task<FilesystemResult<T>> wrapped, Func<T, Task<V>> func)
+		public async static Task<FilesystemResult<V>> OnSuccess<V, T>(this Task<FilesystemResult<T>> wrapped, Func<T?, Task<V>> func)
 		{
 			var res = await wrapped;
 			if (res)
-			{
 				return await Wrap(() => func(res.Result));
-			}
 			return new FilesystemResult<V>(default, res.ErrorCode);
 		}
 
-		private static FileSystemStatusCode ToStatusCode(Type T)
-			=> T == typeof(StorageFolderWithPath) || typeof(IStorageFolder).IsAssignableFrom(T)
+		private static FileSystemStatusCode ToStatusCode(Type? T)
+			=> T == typeof(StorageFolderWithPath) || T is not null && typeof(IStorageFolder).IsAssignableFrom(T)
 				? FileSystemStatusCode.NotAFolder
 				: FileSystemStatusCode.NotAFile;
 	}
diff --git a/src/Files.App/Utils/Storage/Helpers/FolderHelpers.cs b/src/Files.App/Utils/Storage/Helpers/FolderHelpers.cs
index 9d7b30a095e1..017436d3d7aa 100644
--- a/src/Files.App/Utils/Storage/Helpers/FolderHelpers.cs
+++ b/src/Files.App/Utils/Storage/Helpers/FolderHelpers.cs
@@ -21,7 +21,7 @@ public static bool CheckFolderAccessWithWin32(string path)
 			return false;
 		}
 
-		public static async Task<bool> CheckBitlockerStatusAsync(BaseStorageFolder rootFolder, string path)
+		public static async Task<bool> CheckBitlockerStatusAsync(BaseStorageFolder? rootFolder, string path)
 		{
 			if (rootFolder?.Properties is null)
 			{
diff --git a/src/Files.App/Utils/Storage/Helpers/FtpHelpers.cs b/src/Files.App/Utils/Storage/Helpers/FtpHelpers.cs
index 14e80904a818..24cdc8b252ff 100644
--- a/src/Files.App/Utils/Storage/Helpers/FtpHelpers.cs
+++ b/src/Files.App/Utils/Storage/Helpers/FtpHelpers.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using FluentFTP;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Files.App.Utils.Storage
 {
@@ -17,7 +18,7 @@ public static async Task<bool> EnsureConnectedAsync(this AsyncFtpClient ftpClien
 			return true;
 		}
 
-		public static bool IsFtpPath(string path)
+		public static bool IsFtpPath([NotNullWhen(true)] string? path)
 		{
 			if (!string.IsNullOrEmpty(path))
 			{
@@ -78,4 +79,4 @@ public static int GetRootIndex(string path)
 			return path.IndexOf('/', schemaIndex);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/Helpers/IStorageItemWithPath.cs b/src/Files.App/Utils/Storage/Helpers/IStorageItemWithPath.cs
index 19f080e987a9..f0372790e292 100644
--- a/src/Files.App/Utils/Storage/Helpers/IStorageItemWithPath.cs
+++ b/src/Files.App/Utils/Storage/Helpers/IStorageItemWithPath.cs
@@ -11,7 +11,7 @@ public interface IStorageItemWithPath
 
 		public string Path { get; }
 
-		public IStorageItem Item { get; }
+		public IStorageItem? Item { get; }
 
 		public FilesystemItemType ItemType { get; }
 	}
diff --git a/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs b/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs
index efe31e6c18d7..ee089edb9c15 100644
--- a/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs
+++ b/src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs
@@ -17,12 +17,12 @@ public static class StorageFileExtensions
 		public static readonly ImmutableHashSet<string> _ftpPaths =
 			new HashSet<string>() { "ftp:/", "ftps:/", "ftpes:/" }.ToImmutableHashSet();
 
-		public static BaseStorageFile? AsBaseStorageFile(this IStorageItem item)
+		public static BaseStorageFile? AsBaseStorageFile(this IStorageItem? item)
 		{
 			if (item is null || !item.IsOfType(StorageItemTypes.File))
 				return null;
 
-			return item is StorageFile file ? (BaseStorageFile)file : item as BaseStorageFile;
+			return item is StorageFile file ? new SystemStorageFile(file) : item as BaseStorageFile;
 		}
 
 		public static async Task<List<IStorageItem>> ToStandardStorageItemsAsync(this IEnumerable<IStorageItem> items)
@@ -37,11 +37,11 @@ public static async Task<List<IStorageItem>> ToStandardStorageItemsAsync(this IE
 					}
 					else if (item.IsOfType(StorageItemTypes.File))
 					{
-						newItems.Add(await item.AsBaseStorageFile().ToStorageFileAsync());
+						newItems.Add(await item.AsBaseStorageFile()!.ToStorageFileAsync());
 					}
 					else if (item.IsOfType(StorageItemTypes.Folder))
 					{
-						newItems.Add(await item.AsBaseStorageFolder().ToStorageFolderAsync());
+						newItems.Add(await item.AsBaseStorageFolder()!.ToStorageFolderAsync());
 					}
 				}
 				catch (NotSupportedException)
@@ -52,21 +52,21 @@ public static async Task<List<IStorageItem>> ToStandardStorageItemsAsync(this IE
 			return newItems;
 		}
 
-		public static bool AreItemsInSameDrive(this IEnumerable<string> itemsPath, string destinationPath)
+		public static bool AreItemsInSameDrive(this IEnumerable<string> itemsPath, string? destinationPath)
 		{
 			try
 			{
 				var destinationRoot = Path.GetPathRoot(destinationPath);
-				return itemsPath.Any(itemPath => Path.GetPathRoot(itemPath).Equals(destinationRoot, StringComparison.OrdinalIgnoreCase));
+				return itemsPath.Any(itemPath => string.Equals(Path.GetPathRoot(itemPath), destinationRoot, StringComparison.OrdinalIgnoreCase));
 			}
 			catch
 			{
 				return false;
 			}
 		}
-		public static bool AreItemsInSameDrive(this IEnumerable<IStorageItem> storageItems, string destinationPath)
+		public static bool AreItemsInSameDrive(this IEnumerable<IStorageItem> storageItems, string? destinationPath)
 			=> storageItems.Select(x => x.Path).AreItemsInSameDrive(destinationPath);
-		public static bool AreItemsInSameDrive(this IEnumerable<IStorageItemWithPath> storageItems, string destinationPath)
+		public static bool AreItemsInSameDrive(this IEnumerable<IStorageItemWithPath> storageItems, string? destinationPath)
 			=> storageItems.Select(x => x.Path).AreItemsInSameDrive(destinationPath);
 
 		public static bool AreItemsAlreadyInFolder(this IEnumerable<string> itemsPath, string destinationPath)
@@ -74,7 +74,7 @@ public static bool AreItemsAlreadyInFolder(this IEnumerable<string> itemsPath, s
 			try
 			{
 				var trimmedPath = destinationPath.TrimPath();
-				return itemsPath.All(itemPath => Path.GetDirectoryName(itemPath).Equals(trimmedPath, StringComparison.OrdinalIgnoreCase));
+				return itemsPath.All(itemPath => string.Equals(Path.GetDirectoryName(itemPath), trimmedPath, StringComparison.OrdinalIgnoreCase));
 			}
 			catch
 			{
@@ -86,10 +86,10 @@ public static bool AreItemsAlreadyInFolder(this IEnumerable<IStorageItem> storag
 		public static bool AreItemsAlreadyInFolder(this IEnumerable<IStorageItemWithPath> storageItems, string destinationPath)
 			=> storageItems.Select(x => x.Path).AreItemsAlreadyInFolder(destinationPath);
 
-		public static BaseStorageFolder? AsBaseStorageFolder(this IStorageItem item)
+		public static BaseStorageFolder? AsBaseStorageFolder(this IStorageItem? item)
 		{
 			if (item is not null && item.IsOfType(StorageItemTypes.Folder))
-				return item is StorageFolder folder ? (BaseStorageFolder)folder : item as BaseStorageFolder;
+				return item is StorageFolder folder ? new SystemStorageFolder(folder) : item as BaseStorageFolder;
 
 			return null;
 		}
@@ -146,7 +146,8 @@ public static async Task<List<PathBoxItem>> GetDirectoryPathComponentsWithDispla
 					item.Title = Strings.Settings.GetLocalizedResource();
 				else
 				{
-					BaseStorageFolder folder = await FilesystemTasks.Wrap(() => DangerousGetFolderFromPathAsync(item.Path));
+					var path = item.Path!;
+					BaseStorageFolder? folder = await FilesystemTasks.WrapNullable(() => DangerousGetFolderFromPathAsync(path));
 
 					if (!string.IsNullOrEmpty(folder?.DisplayName))
 						item.Title = folder.DisplayName;
@@ -164,40 +165,41 @@ public static string GetResolvedPath(string path, bool isFtp)
 			return ResolvePath(withoutEnvirnment, isFtp);
 		}
 
-		public async static Task<BaseStorageFile> DangerousGetFileFromPathAsync
-			(string value, StorageFolderWithPath rootFolder = null, StorageFolderWithPath parentFolder = null)
+		public async static Task<BaseStorageFile?> DangerousGetFileFromPathAsync
+			(string value, StorageFolderWithPath? rootFolder = null, StorageFolderWithPath? parentFolder = null)
 				=> (await DangerousGetFileWithPathFromPathAsync(value, rootFolder, parentFolder)).Item;
 		public async static Task<StorageFileWithPath> DangerousGetFileWithPathFromPathAsync
-			(string value, StorageFolderWithPath rootFolder = null, StorageFolderWithPath parentFolder = null)
+			(string value, StorageFolderWithPath? rootFolder = null, StorageFolderWithPath? parentFolder = null)
 		{
 			if (rootFolder is not null)
 			{
+				var rootItem = rootFolder.Item!;
 				var currComponents = GetDirectoryPathComponents(value);
 
 				if (parentFolder is not null && value.IsSubPathOf(parentFolder.Path))
 				{
-					var folder = parentFolder.Item;
+					var folder = parentFolder.Item!;
 					var prevComponents = GetDirectoryPathComponents(parentFolder.Path);
 					var path = parentFolder.Path;
 					foreach (var component in currComponents.ExceptBy(prevComponents, c => c.Path).SkipLast(1))
 					{
-						folder = await folder.GetFolderAsync(component.Title);
+						folder = await folder.GetFolderAsync(component.Title ?? throw new InvalidOperationException("A path component is missing its title."));
 						path = PathNormalization.Combine(path, folder.Name);
 					}
-					var file = await folder.GetFileAsync(currComponents.Last().Title);
+					var file = await folder.GetFileAsync(currComponents.Last().Title ?? throw new InvalidOperationException("A path component is missing its title."));
 					path = PathNormalization.Combine(path, file.Name);
 					return new StorageFileWithPath(file, path);
 				}
 				else if (value.IsSubPathOf(rootFolder.Path))
 				{
-					var folder = rootFolder.Item;
+					var folder = rootItem;
 					var path = rootFolder.Path;
 					foreach (var component in currComponents.Skip(1).SkipLast(1))
 					{
-						folder = await folder.GetFolderAsync(component.Title);
+						folder = await folder.GetFolderAsync(component.Title ?? throw new InvalidOperationException("A path component is missing its title."));
 						path = PathNormalization.Combine(path, folder.Name);
 					}
-					var file = await folder.GetFileAsync(currComponents.Last().Title);
+					var file = await folder.GetFileAsync(currComponents.Last().Title ?? throw new InvalidOperationException("A path component is missing its title."));
 					path = PathNormalization.Combine(path, file.Name);
 					return new StorageFileWithPath(file, path);
 				}
@@ -215,19 +217,20 @@ public async static Task<StorageFileWithPath> DangerousGetFileWithPathFromPathAs
 		}
 		public async static Task<IList<StorageFileWithPath>> GetFilesWithPathAsync
 			(this StorageFolderWithPath parentFolder, uint maxNumberOfItems = uint.MaxValue)
-				=> (await parentFolder.Item.GetFilesAsync(CommonFileQuery.DefaultQuery, 0, maxNumberOfItems))
+				=> (await parentFolder.Item!.GetFilesAsync(CommonFileQuery.DefaultQuery, 0, maxNumberOfItems))
 					.Select(x => new StorageFileWithPath(x, string.IsNullOrEmpty(x.Path) ? PathNormalization.Combine(parentFolder.Path, x.Name) : x.Path)).ToList();
 
-		public async static Task<BaseStorageFolder> DangerousGetFolderFromPathAsync
-			(string value, StorageFolderWithPath rootFolder = null, StorageFolderWithPath parentFolder = null)
+		public async static Task<BaseStorageFolder?> DangerousGetFolderFromPathAsync
+			(string value, StorageFolderWithPath? rootFolder = null, StorageFolderWithPath? parentFolder = null)
 				=> (await DangerousGetFolderWithPathFromPathAsync(value, rootFolder, parentFolder)).Item;
 		public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPathAsync
-			(string value, StorageFolderWithPath rootFolder = null, StorageFolderWithPath parentFolder = null)
+			(string value, StorageFolderWithPath? rootFolder = null, StorageFolderWithPath? parentFolder = null)
 		{
 			// Archive paths can't be resolved by chaining WinRT GetFolderAsync from a network root/parent
 			// (an archive is not a real subfolder of the share); resolve them directly like local archives.
 			if (rootFolder is not null && !ZipStorageFolder.IsZipPath(value))
 			{
+				var rootItem = rootFolder.Item!;
 				var currComponents = GetDirectoryPathComponents(value);
 
 				if (rootFolder.Path == value)
@@ -236,23 +239,23 @@ public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPa
 				}
 				else if (parentFolder is not null && value.IsSubPathOf(parentFolder.Path))
 				{
-					var folder = parentFolder.Item;
+					var folder = parentFolder.Item!;
 					var prevComponents = GetDirectoryPathComponents(parentFolder.Path);
 					var path = parentFolder.Path;
 					foreach (var component in currComponents.ExceptBy(prevComponents, c => c.Path))
 					{
-						folder = await folder.GetFolderAsync(component.Title);
+						folder = await folder.GetFolderAsync(component.Title ?? throw new InvalidOperationException("A path component is missing its title."));
 						path = PathNormalization.Combine(path, folder.Name);
 					}
 					return new StorageFolderWithPath(folder, path);
 				}
 				else if (value.IsSubPathOf(rootFolder.Path))
 				{
-					var folder = rootFolder.Item;
+					var folder = rootItem;
 					var path = rootFolder.Path;
 					foreach (var component in currComponents.Skip(1))
 					{
-						folder = await folder.GetFolderAsync(component.Title);
+						folder = await folder.GetFolderAsync(component.Title ?? throw new InvalidOperationException("A path component is missing its title."));
 						path = PathNormalization.Combine(path, folder.Name);
 					}
 					return new StorageFolderWithPath(folder, path);
@@ -271,19 +274,21 @@ public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPa
 		}
 		public async static Task<IList<StorageFolderWithPath>> GetFoldersWithPathAsync
 			(this StorageFolderWithPath parentFolder, uint maxNumberOfItems = uint.MaxValue)
-				=> (await parentFolder.Item.GetFoldersAsync(CommonFolderQuery.DefaultQuery, 0, maxNumberOfItems))
+				=> (await parentFolder.Item!.GetFoldersAsync(CommonFolderQuery.DefaultQuery, 0, maxNumberOfItems))
 					.Select(x => new StorageFolderWithPath(x, string.IsNullOrEmpty(x.Path) ? PathNormalization.Combine(parentFolder.Path, x.Name) : x.Path)).ToList();
-		public async static Task<IList<StorageFolderWithPath>> GetFoldersWithPathAsync
+		public async static Task<IList<StorageFolderWithPath>?> GetFoldersWithPathAsync
 			(this StorageFolderWithPath parentFolder, string nameFilter, uint maxNumberOfItems = uint.MaxValue)
 		{
 			if (parentFolder is null)
 				return null;
 
+			var folder = parentFolder.Item!;
+
 			var queryOptions = new QueryOptions
 			{
 				ApplicationSearchFilter = $"System.FileName:{nameFilter}*"
 			};
-			BaseStorageFolderQueryResult queryResult = parentFolder.Item.CreateFolderQueryWithOptions(queryOptions);
+			BaseStorageFolderQueryResult queryResult = folder.CreateFolderQueryWithOptions(queryOptions);
 
 			return (await queryResult.GetFoldersAsync(0, maxNumberOfItems))
 				.Select(x => new StorageFolderWithPath(x, string.IsNullOrEmpty(x.Path) ? PathNormalization.Combine(parentFolder.Path, x.Name) : x.Path)).ToList();
@@ -310,7 +315,7 @@ private static PathBoxItem GetPathItem(string component, string path)
 				var drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
 				var drives = drivesViewModel.Drives.Cast<DriveItem>();
-				var drive = drives.FirstOrDefault(y => y.ItemType is NavigationControlItemType.Drive && y.Path.Contains(component, StringComparison.OrdinalIgnoreCase));
+				var drive = drives.FirstOrDefault(y => y.ItemType is NavigationControlItemType.Drive && y.Path!.Contains(component, StringComparison.OrdinalIgnoreCase));
 				title = drive is not null ? drive.Text : string.Format(Strings.DriveWithLetter.GetLocalizedResource(), component);
 			}
 			else
@@ -431,7 +436,7 @@ private static void SetCurrentWorkingDirectory(StringBuilder path, char separato
 			var subPath = path.ToString().Substring(substringIndex);
 
 			path.Clear();
-			path.Append(context.ShellPage?.ShellViewModel.WorkingDirectory);
+			path.Append(context.ShellPage?.ShellViewModel?.WorkingDirectory);
 			path.Append(separator);
 			path.Append(subPath);
 			i = -1;
diff --git a/src/Files.App/Utils/Storage/Helpers/StorageFileWithPath.cs b/src/Files.App/Utils/Storage/Helpers/StorageFileWithPath.cs
index 9fb6dccfbffe..880213b48dd6 100644
--- a/src/Files.App/Utils/Storage/Helpers/StorageFileWithPath.cs
+++ b/src/Files.App/Utils/Storage/Helpers/StorageFileWithPath.cs
@@ -9,16 +9,16 @@ namespace Files.App.Utils
 	public sealed class StorageFileWithPath : IStorageItemWithPath
 	{
 		public string Path { get; }
-		public string Name => Item?.Name ?? IO.Path.GetFileName(Path);
+		public string Name => Item?.Name ?? IO.Path.GetFileName(Path)!;
 
-		IStorageItem IStorageItemWithPath.Item => Item;
-		public BaseStorageFile Item { get; }
+		IStorageItem? IStorageItemWithPath.Item => Item;
+		public BaseStorageFile? Item { get; }
 
 		public FilesystemItemType ItemType => FilesystemItemType.File;
 
 		public StorageFileWithPath(BaseStorageFile file)
 			: this(file, file.Path) { }
-		public StorageFileWithPath(BaseStorageFile file, string path)
+		public StorageFileWithPath(BaseStorageFile? file, string path)
 			=> (Item, Path) = (file, path);
 	}
 }
diff --git a/src/Files.App/Utils/Storage/Helpers/StorageFolderWithPath.cs b/src/Files.App/Utils/Storage/Helpers/StorageFolderWithPath.cs
index d9d5eaff4cfd..7a93240dc75e 100644
--- a/src/Files.App/Utils/Storage/Helpers/StorageFolderWithPath.cs
+++ b/src/Files.App/Utils/Storage/Helpers/StorageFolderWithPath.cs
@@ -9,16 +9,16 @@ namespace Files.App.Utils
 	public sealed class StorageFolderWithPath : IStorageItemWithPath
 	{
 		public string Path { get; }
-		public string Name => Item?.Name ?? IO.Path.GetFileName(Path);
+		public string Name => Item?.Name ?? IO.Path.GetFileName(Path)!;
 
-		IStorageItem IStorageItemWithPath.Item => Item;
-		public BaseStorageFolder Item { get; }
+		IStorageItem? IStorageItemWithPath.Item => Item;
+		public BaseStorageFolder? Item { get; }
 
 		public FilesystemItemType ItemType => FilesystemItemType.Directory;
 
 		public StorageFolderWithPath(BaseStorageFolder folder)
 			: this(folder, folder.Path) { }
-		public StorageFolderWithPath(BaseStorageFolder folder, string path)
+		public StorageFolderWithPath(BaseStorageFolder? folder, string path)
 			=> (Item, Path) = (folder, path);
 	}
 }
diff --git a/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs b/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs
index 5af8817424d7..6ee0345159dd 100644
--- a/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs
+++ b/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs
@@ -13,15 +13,15 @@ namespace Files.App.Helpers
 	/// </summary>
 	public static class StorageHelpers
 	{
-		public static async Task<IStorageItem> ToStorageItem(this IStorageItemWithPath item)
+		public static async Task<IStorageItem?> ToStorageItem(this IStorageItemWithPath item)
 		{
 			return (await item.ToStorageItemResult()).Result;
 		}
 
-		public static async Task<TRequested> ToStorageItem<TRequested>(string path) where TRequested : IStorageItem
+		public static async Task<TRequested?> ToStorageItem<TRequested>(string path) where TRequested : IStorageItem
 		{
-			FilesystemResult<BaseStorageFile> file = null;
-			FilesystemResult<BaseStorageFolder> folder = null;
+			FilesystemResult<BaseStorageFile>? file = null;
+			FilesystemResult<BaseStorageFolder>? folder = null;
 
 			if (FileExtensionHelpers.IsShortcutOrUrlFile(path))
 			{
@@ -80,11 +80,11 @@ public static async Task<TRequested> ToStorageItem<TRequested>(string path) wher
 						await GetFileAsync();
 					}
 
-					if (!file || file.Result is null) // Possibly a folder
+					if (file?.Result is null) // Possibly a folder
 					{
 						await GetFolderAsync();
 
-						if (file is null && (!folder || folder.Result is null))
+						if (file is null && folder?.Result is null)
 						{
 							// Try file because it wasn't checked
 							await GetFileAsync();
@@ -93,13 +93,13 @@ public static async Task<TRequested> ToStorageItem<TRequested>(string path) wher
 				}
 			}
 
-			if (file is not null && file)
+			if (file?.Result is TRequested requestedFile)
 			{
-				return (TRequested)(IStorageItem)file.Result;
+				return requestedFile;
 			}
-			else if (folder is not null && folder)
+			else if (folder?.Result is TRequested requestedFolder)
 			{
-				return (TRequested)(IStorageItem)folder.Result;
+				return requestedFolder;
 			}
 
 			return default;
@@ -108,14 +108,14 @@ public static async Task<TRequested> ToStorageItem<TRequested>(string path) wher
 
 			async Task GetFileAsync()
 			{
-				var rootItem = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(path));
-				file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(path, rootItem));
+				var rootItem = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(path));
+				file = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(path, rootItem.Result));
 			}
 
 			async Task GetFolderAsync()
 			{
-				var rootItem = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(path));
-				folder = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, rootItem));
+				var rootItem = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(path));
+				folder = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, rootItem.Result));
 			}
 		}
 
@@ -128,14 +128,14 @@ public static async Task<long> GetFileSize(this IStorageFile file)
 		public static async Task<FilesystemResult<IStorageItem>> ToStorageItemResult(this IStorageItemWithPath item)
 		{
 			var returnedItem = new FilesystemResult<IStorageItem>(null, FileSystemStatusCode.Generic);
-			var rootItem = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(item.Path));
+			var rootItem = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(item.Path));
 			if (!string.IsNullOrEmpty(item.Path))
 			{
 				returnedItem = (item.ItemType == FilesystemItemType.File) ?
 					ToType<IStorageItem, BaseStorageFile>(
-						await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.Path, rootItem))) :
+						await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.Path, rootItem))) :
 					ToType<IStorageItem, BaseStorageFolder>(
-						await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(item.Path, rootItem)));
+						await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(item.Path, rootItem)));
 			}
 			if (returnedItem.Result is null && item.Item is not null)
 				returnedItem = new FilesystemResult<IStorageItem>(item.Item, FileSystemStatusCode.Success);
@@ -153,7 +153,7 @@ public static IStorageItemWithPath FromPathAndType(string customPath, Filesystem
 
 		public static async Task<FilesystemItemType> GetTypeFromPath(string path)
 		{
-			IStorageItem item = await ToStorageItem<IStorageItem>(path);
+			IStorageItem? item = await ToStorageItem<IStorageItem>(path);
 
 			return item is null ? FilesystemItemType.File : (item.IsOfType(StorageItemTypes.Folder) ? FilesystemItemType.Directory : FilesystemItemType.File);
 		}
@@ -163,21 +163,27 @@ public static bool Exists(string path)
 			return Win32PInvoke.GetFileAttributesExFromApp(path, Win32PInvoke.GET_FILEEX_INFO_LEVELS.GetFileExInfoStandard, out _);
 		}
 
-		public static IStorageItemWithPath FromStorageItem(this IStorageItem item, string customPath = null, FilesystemItemType? itemType = null)
+		public static IStorageItemWithPath? FromStorageItem(this IStorageItem? item, string? customPath = null, FilesystemItemType? itemType = null)
 		{
 			if (item is null)
 			{
-				return FromPathAndType(customPath, itemType);
+				return FromPathAndType(customPath
+					?? throw new InvalidOperationException("A path is required when converting a missing storage item."), itemType);
 			}
 			else if (item.IsOfType(StorageItemTypes.File))
 			{
-				return new StorageFileWithPath(item.AsBaseStorageFile(), string.IsNullOrEmpty(item.Path) ? customPath : item.Path);
+				return new StorageFileWithPath(item.AsBaseStorageFile(), GetPath(item, customPath));
 			}
 			else if (item.IsOfType(StorageItemTypes.Folder))
 			{
-				return new StorageFolderWithPath(item.AsBaseStorageFolder(), string.IsNullOrEmpty(item.Path) ? customPath : item.Path);
+				return new StorageFolderWithPath(item.AsBaseStorageFolder(), GetPath(item, customPath));
 			}
 			return null;
+
+			static string GetPath(IStorageItem item, string? customPath)
+				=> !string.IsNullOrEmpty(item.Path)
+					? item.Path
+					: customPath ?? string.Empty;
 		}
 
 		public static FilesystemResult<T> ToType<T, V>(FilesystemResult<V> result) where T : class
@@ -185,4 +191,4 @@ public static FilesystemResult<T> ToType<T, V>(FilesystemResult<V> result) where
 			return new FilesystemResult<T>(result.Result as T, result.ErrorCode);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/Helpers/StorageItemIconHelpers.cs b/src/Files.App/Utils/Storage/Helpers/StorageItemIconHelpers.cs
index ff6dbefba6ec..bc490024ceca 100644
--- a/src/Files.App/Utils/Storage/Helpers/StorageItemIconHelpers.cs
+++ b/src/Files.App/Utils/Storage/Helpers/StorageItemIconHelpers.cs
@@ -15,7 +15,7 @@ public static class StorageItemIconHelpers
 		/// <param name="persistenceOptions">Optionally choose not to persist icon-backing item in LocalCache</param>
 		/// <param name="fileExtension">The file type (extension) of the generic icon to retrieve. Leave empty if a directory icon is desired</param>
 		/// <returns></returns>
-		public static async Task<StorageItemThumbnail> GetIconForItemType(uint requestedSize, IconPersistenceOptions persistenceOptions = IconPersistenceOptions.Persist, string fileExtension = null)
+		public static async Task<StorageItemThumbnail> GetIconForItemType(uint requestedSize, IconPersistenceOptions persistenceOptions = IconPersistenceOptions.Persist, string? fileExtension = null)
 		{
 			if (string.IsNullOrEmpty(fileExtension))
 			{
diff --git a/src/Files.App/Utils/Storage/History/IStorageHistory.cs b/src/Files.App/Utils/Storage/History/IStorageHistory.cs
index e1247978f08a..fa3a90781980 100644
--- a/src/Files.App/Utils/Storage/History/IStorageHistory.cs
+++ b/src/Files.App/Utils/Storage/History/IStorageHistory.cs
@@ -28,10 +28,10 @@ public interface IStorageHistory
 		/// <br/>
 		/// May contain more that one item
 		/// </summary>
-		IList<IStorageItemWithPath> Destination { get; }
+		IList<IStorageItemWithPath>? Destination { get; }
 
 		void Modify(IStorageHistory newHistory);
-		void Modify(FileOperationType operationType, IStorageItemWithPath source, IStorageItemWithPath destination);
-		void Modify(FileOperationType operationType, IList<IStorageItemWithPath> source, IList<IStorageItemWithPath> destination);
+		void Modify(FileOperationType operationType, IStorageItemWithPath source, IStorageItemWithPath? destination);
+		void Modify(FileOperationType operationType, IList<IStorageItemWithPath> source, IList<IStorageItemWithPath>? destination);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/History/StorageHistory.cs b/src/Files.App/Utils/Storage/History/StorageHistory.cs
index ad434d36db40..263c8a5a0940 100644
--- a/src/Files.App/Utils/Storage/History/StorageHistory.cs
+++ b/src/Files.App/Utils/Storage/History/StorageHistory.cs
@@ -9,14 +9,14 @@ public sealed class StorageHistory : IStorageHistory
 
 		public IList<IStorageItemWithPath> Source { get; private set; }
 
-		public IList<IStorageItemWithPath> Destination { get; private set; }
+		public IList<IStorageItemWithPath>? Destination { get; private set; }
 
-		public StorageHistory(FileOperationType operationType, IStorageItemWithPath source, IStorageItemWithPath destination)
-			: this(operationType, source.CreateList(), destination.CreateList())
+		public StorageHistory(FileOperationType operationType, IStorageItemWithPath source, IStorageItemWithPath? destination)
+			: this(operationType, source.CreateList(), destination?.CreateList())
 		{
 		}
 
-		public StorageHistory(FileOperationType operationType, IList<IStorageItemWithPath> source, IList<IStorageItemWithPath> destination)
+		public StorageHistory(FileOperationType operationType, IList<IStorageItemWithPath> source, IList<IStorageItemWithPath>? destination)
 		{
 			OperationType = operationType;
 			Source = source;
@@ -25,9 +25,9 @@ public StorageHistory(FileOperationType operationType, IList<IStorageItemWithPat
 
 		public void Modify(IStorageHistory newHistory)
 			=> (OperationType, Source, Destination) = (newHistory.OperationType, newHistory.Source, newHistory.Destination);
-		public void Modify(FileOperationType operationType, IStorageItemWithPath source, IStorageItemWithPath destination)
-			=> (OperationType, Source, Destination) = (operationType, source.CreateList(), destination.CreateList());
-		public void Modify(FileOperationType operationType, IList<IStorageItemWithPath> source, IList<IStorageItemWithPath> destination)
+		public void Modify(FileOperationType operationType, IStorageItemWithPath source, IStorageItemWithPath? destination)
+			=> (OperationType, Source, Destination) = (operationType, source.CreateList(), destination?.CreateList());
+		public void Modify(FileOperationType operationType, IList<IStorageItemWithPath> source, IList<IStorageItemWithPath>? destination)
 			=> (OperationType, Source, Destination) = (operationType, source, destination);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/History/StorageHistoryHelpers.cs b/src/Files.App/Utils/Storage/History/StorageHistoryHelpers.cs
index c798d35af4bc..cb3799b34fa0 100644
--- a/src/Files.App/Utils/Storage/History/StorageHistoryHelpers.cs
+++ b/src/Files.App/Utils/Storage/History/StorageHistoryHelpers.cs
@@ -5,7 +5,7 @@ namespace Files.App.Utils.Storage
 {
 	public sealed partial class StorageHistoryHelpers : IDisposable
 	{
-		private IStorageHistoryOperations operations;
+		private IStorageHistoryOperations? operations;
 
 		private static SemaphoreSlim semaphore = new SemaphoreSlim(1, 1);
 
@@ -14,6 +14,8 @@ public StorageHistoryHelpers(IStorageHistoryOperations storageHistoryOperations)
 
 		public async Task<ReturnResult> TryUndo()
 		{
+			var operations = this.operations ?? throw new ObjectDisposedException(nameof(StorageHistoryHelpers));
+
 			if (App.HistoryWrapper.CanUndo())
 			{
 				if (!await semaphore.WaitAsync(0))
@@ -41,6 +43,8 @@ public async Task<ReturnResult> TryUndo()
 
 		public async Task<ReturnResult> TryRedo()
 		{
+			var operations = this.operations ?? throw new ObjectDisposedException(nameof(StorageHistoryHelpers));
+
 			if (App.HistoryWrapper.CanRedo())
 			{
 				if (!await semaphore.WaitAsync(0))
@@ -67,4 +71,4 @@ public void Dispose()
 			operations = null;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/History/StorageHistoryOperations.cs b/src/Files.App/Utils/Storage/History/StorageHistoryOperations.cs
index 76a07c913a95..bf7ab30ae2e1 100644
--- a/src/Files.App/Utils/Storage/History/StorageHistoryOperations.cs
+++ b/src/Files.App/Utils/Storage/History/StorageHistoryOperations.cs
@@ -2,14 +2,15 @@
 // Licensed under the MIT License.
 
 using System.IO;
+using System.Diagnostics.CodeAnalysis;
 using Windows.Storage;
 
 namespace Files.App.Utils.Storage
 {
 	public sealed partial class StorageHistoryOperations : IStorageHistoryOperations
 	{
-		private IFilesystemHelpers helpers;
-		private ShellFilesystemOperations operations;
+		private IFilesystemHelpers? helpers;
+		private ShellFilesystemOperations? operations;
 
 		private readonly CancellationToken cancellationToken;
 
@@ -22,6 +23,8 @@ public StorageHistoryOperations(IShellPage associatedInstance, CancellationToken
 
 		public async Task<ReturnResult> Undo(IStorageHistory history)
 		{
+			var helpers = this.helpers ?? throw new ObjectDisposedException(nameof(StorageHistoryOperations));
+			var operations = this.operations ?? throw new ObjectDisposedException(nameof(StorageHistoryOperations));
 			ReturnResult returnStatus = ReturnResult.InProgress;
 			Progress<StatusCenterItemProgressModel> progress = new();
 
@@ -37,34 +40,38 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
 					}
 					break;
 				case FileOperationType.CreateLink: // Opposite: Delete created items
-					if (!IsHistoryNull(history.Destination))
+					var createdLinks = history.Destination;
+					if (!IsHistoryNull(createdLinks))
 					{
 						// Show a dialog regardless of the setting to prevent unexpected deletion
-						return await helpers.DeleteItemsAsync(history.Destination, DeleteConfirmationPolicies.Always, true, false);
+						return await helpers.DeleteItemsAsync(createdLinks, DeleteConfirmationPolicies.Always, true, false);
 					}
 					break;
 				case FileOperationType.Rename: // Opposite: Restore original item names
-					if (!IsHistoryNull(history))
+					var renamedItems = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(renamedItems))
 					{
 						NameCollisionOption collision = NameCollisionOption.GenerateUniqueName;
-						for (int i = 0; i < history.Destination.Count; i++)
+						for (int i = 0; i < renamedItems.Count; i++)
 						{
 							string name = Path.GetFileName(history.Source[i].Path);
-							await operations.RenameAsync(history.Destination[i], name, collision, progress, cancellationToken);
+							await operations.RenameAsync(renamedItems[i], name, collision, progress, cancellationToken);
 						}
 					}
 					break;
 				case FileOperationType.Copy: // Opposite: Delete copied items
-					if (!IsHistoryNull(history.Destination))
+					var copiedItems = history.Destination;
+					if (!IsHistoryNull(copiedItems))
 					{
 						// Show a dialog regardless of the setting to prevent unexpected deletion
-						return await helpers.DeleteItemsAsync(history.Destination, DeleteConfirmationPolicies.Always, true, false);
+						return await helpers.DeleteItemsAsync(copiedItems, DeleteConfirmationPolicies.Always, true, false);
 					}
 					break;
 				case FileOperationType.Move: // Opposite: Move the items to original directory
-					if (!IsHistoryNull(history))
+					var movedItems = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(movedItems))
 					{
-						return await helpers.MoveItemsAsync(history.Destination, history.Source.Select(item => item.Path), false, false);
+						return await helpers.MoveItemsAsync(movedItems, history.Source.Select(item => item.Path), false, false);
 					}
 					break;
 				case FileOperationType.Extract: // Opposite: No opposite for archive extraction
@@ -72,9 +79,10 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
 					Debugger.Break();
 					break;
 				case FileOperationType.Recycle: // Opposite: Restore recycled items
-					if (!IsHistoryNull(history))
+					var recycledItems = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(recycledItems))
 					{
-						returnStatus = await helpers.RestoreItemsFromTrashAsync(history.Destination, history.Source.Select(item => item.Path), false);
+						returnStatus = await helpers.RestoreItemsFromTrashAsync(recycledItems, history.Source.Select(item => item.Path), false);
 						if (returnStatus is ReturnResult.IntegrityCheckFailed) // Not found, corrupted
 						{
 							App.HistoryWrapper.RemoveHistory(history, false);
@@ -82,9 +90,10 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
 					}
 					break;
 				case FileOperationType.Restore: // Opposite: Move restored items to Recycle Bin
-					if (!IsHistoryNull(history.Destination))
+					var restoredItems = history.Destination;
+					if (!IsHistoryNull(restoredItems))
 					{
-						var newHistory = await operations.DeleteItemsAsync(history.Destination, progress, false, cancellationToken);
+						var newHistory = await operations.DeleteItemsAsync(restoredItems, progress, false, cancellationToken);
 						if (newHistory is null)
 						{
 							App.HistoryWrapper.RemoveHistory(history, false);
@@ -106,6 +115,8 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
 
 		public async Task<ReturnResult> Redo(IStorageHistory history)
 		{
+			var helpers = this.helpers ?? throw new ObjectDisposedException(nameof(StorageHistoryOperations));
+			var operations = this.operations ?? throw new ObjectDisposedException(nameof(StorageHistoryOperations));
 			ReturnResult returnStatus = ReturnResult.InProgress;
 			Progress<StatusCenterItemProgressModel> progress = new();
 
@@ -114,42 +125,39 @@ public async Task<ReturnResult> Redo(IStorageHistory history)
 			switch (history.OperationType)
 			{
 				case FileOperationType.CreateNew:
-					if (IsHistoryNull(history))
-					{
-						foreach (var source in history.Source)
-						{
-							await operations.CreateAsync(source, progress, cancellationToken);
-						}
-					}
 					break;
 				case FileOperationType.CreateLink:
-					if (!IsHistoryNull(history))
+					var linkDestinations = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(linkDestinations))
 					{
 						await operations.CreateShortcutItemsAsync(history.Source,
-							await history.Destination.Select(item => item.Path).ToListAsync(), progress, cancellationToken);
+							await linkDestinations.Select(item => item.Path).ToListAsync(), progress, cancellationToken);
 					}
 					break;
 				case FileOperationType.Rename:
-					if (!IsHistoryNull(history))
+					var renameDestinations = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(renameDestinations))
 					{
 						NameCollisionOption collision = NameCollisionOption.GenerateUniqueName;
 						for (int i = 0; i < history.Source.Count; i++)
 						{
-							string name = Path.GetFileName(history.Destination[i].Path);
+							string name = Path.GetFileName(renameDestinations[i].Path);
 							await operations.RenameAsync(history.Source[i], name, collision, progress, cancellationToken);
 						}
 					}
 					break;
 				case FileOperationType.Copy:
-					if (!IsHistoryNull(history))
+					var copyDestinations = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(copyDestinations))
 					{
-						return await helpers.CopyItemsAsync(history.Source, history.Destination.Select(item => item.Path), false, false);
+						return await helpers.CopyItemsAsync(history.Source, copyDestinations.Select(item => item.Path), false, false);
 					}
 					break;
 				case FileOperationType.Move:
-					if (!IsHistoryNull(history))
+					var moveDestinations = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(moveDestinations))
 					{
-						return await helpers.MoveItemsAsync(history.Source, history.Destination.Select(item => item.Path), false, false);
+						return await helpers.MoveItemsAsync(history.Source, moveDestinations.Select(item => item.Path), false, false);
 					}
 					break;
 				case FileOperationType.Extract:
@@ -157,7 +165,8 @@ await operations.CreateShortcutItemsAsync(history.Source,
 					Debugger.Break();
 					break;
 				case FileOperationType.Recycle: // Recycle PASS
-					if (!IsHistoryNull(history.Destination))
+					var recycleDestinations = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(recycleDestinations))
 					{
 						var newHistory = await operations.DeleteItemsAsync(history.Source, progress, false, cancellationToken);
 						if (newHistory is null)
@@ -172,9 +181,10 @@ await operations.CreateShortcutItemsAsync(history.Source,
 					}
 					break;
 				case FileOperationType.Restore:
-					if (!IsHistoryNull(history))
+					var restoreDestinations = history.Destination;
+					if (!IsHistoryNull(history.Source) && !IsHistoryNull(restoreDestinations))
 					{
-						await helpers.RestoreItemsFromTrashAsync(history.Source, history.Destination.Select(item => item.Path), false);
+						await helpers.RestoreItemsFromTrashAsync(history.Source, restoreDestinations.Select(item => item.Path), false);
 					}
 					break;
 				case FileOperationType.Delete:
@@ -194,10 +204,9 @@ public void Dispose()
 			operations = null;
 		}
 
-		private bool IsHistoryNull(IStorageHistory history) // history.Destination is null with CreateNew
-			=> IsHistoryNull(history.Source) || (history.Destination is not null && IsHistoryNull(history.Destination));
-		private bool IsHistoryNull(IEnumerable<IStorageItemWithPath> source) => !source.All(HasPath);
+		private static bool IsHistoryNull([NotNullWhen(false)] IEnumerable<IStorageItemWithPath>? source)
+			=> source is null || !source.All(HasPath);
 
 		private static bool HasPath(IStorageItemWithPath item) => item is not null && !string.IsNullOrWhiteSpace(item.Path);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/History/StorageHistoryWrapper.cs b/src/Files.App/Utils/Storage/History/StorageHistoryWrapper.cs
index d9d8839aa5a6..51b3bcd456a8 100644
--- a/src/Files.App/Utils/Storage/History/StorageHistoryWrapper.cs
+++ b/src/Files.App/Utils/Storage/History/StorageHistoryWrapper.cs
@@ -45,7 +45,8 @@ public void ModifyCurrentHistory(IStorageHistory newHistory)
 
 		public void Dispose()
 		{
-			histories = null;
+			histories.Clear();
+			index = -1;
 		}
 	}
 }
diff --git a/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs b/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs
index e578783c305e..0a73f7558f2c 100644
--- a/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs
+++ b/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs
@@ -36,7 +36,7 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 			}, App.Logger);
 		}
 
-		public static Task<(bool, ShellOperationResult)> CreateItemAsync(string filePath, string fileOp, long ownerHwnd, bool asAdmin, string template = "", byte[]? dataBytes = null)
+		public static Task<(bool, ShellOperationResult)> CreateItemAsync(string filePath, string fileOp, long ownerHwnd, bool asAdmin, string? template = null, byte[]? dataBytes = null)
 		{
 			return STATask.Run(async () =>
 			{
@@ -54,10 +54,11 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 				op.OwnerWindow = (IntPtr)ownerHwnd;
 
 				var shellOperationResult = new ShellOperationResult();
+				var parentPath = Path.GetDirectoryName(filePath);
 
-				if (!SafetyExtensions.IgnoreExceptions(() =>
+				if (parentPath is null || !SafetyExtensions.IgnoreExceptions(() =>
 				{
-					using var shd = new ShellFolder(Path.GetDirectoryName(filePath));
+					using var shd = new ShellFolder(parentPath);
 					op.QueueNewItemOperation(shd, Path.GetFileName(filePath),
 						fileOp == "CreateFolder" ? FileAttributes.Directory : FileAttributes.Normal, template);
 				}))
@@ -91,11 +92,12 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 					createTcs.TrySetResult(false);
 				}
 
-				if (dataBytes is not null && (shellOperationResult.Items.SingleOrDefault()?.Succeeded ?? false))
+				if (dataBytes is not null &&
+					shellOperationResult.Items.SingleOrDefault() is { Succeeded: true, Destination: { } destination })
 				{
 					SafetyExtensions.IgnoreExceptions(() =>
 					{
-						using var fs = new FileStream(shellOperationResult.Items.Single().Destination, FileMode.Open);
+						using var fs = new FileStream(destination, FileMode.Open);
 						fs.Write(dataBytes, 0, dataBytes.Length);
 						fs.Flush();
 					}, App.Logger);
@@ -193,7 +195,7 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 			}, App.Logger);
 		}
 
-		public static Task<(bool, ShellOperationResult)> DeleteItemAsync(string[] fileToDeletePath, bool permanently, long ownerHwnd, bool asAdmin, IProgress<StatusCenterItemProgressModel> progress, string operationID = "")
+		public static Task<(bool, ShellOperationResult)> DeleteItemAsync(string[] fileToDeletePath, bool permanently, long ownerHwnd, bool asAdmin, IProgress<StatusCenterItemProgressModel>? progress, string operationID = "")
 		{
 			operationID = string.IsNullOrEmpty(operationID) ? Guid.NewGuid().ToString() : operationID;
 
@@ -277,25 +279,31 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 				// Right before deleting item
 				op.PreDeleteItem += (s, e) =>
 				{
-					sizeCalculator.ForceComputeFileSize(e.SourceItem.GetParsingPath());
-					fsProgress.FileName = e.SourceItem.Name;
+					if (e.SourceItem is not { } sourceItem)
+						return;
+
+					if (sourceItem.GetParsingPath() is { } sourcePath)
+						sizeCalculator.ForceComputeFileSize(sourcePath);
+					fsProgress.FileName = sourceItem.Name ?? string.Empty;
 					fsProgress.Report();
 				};
 
 				// Right after deleted item
 				op.PostDeleteItem += (s, e) =>
 				{
-					if (!e.SourceItem.IsFolder)
+					var sourceItem = e.SourceItem;
+					var sourcePath = sourceItem?.GetParsingPath();
+					if (sourceItem is { IsFolder: false } && sourcePath is not null)
 					{
-						if (sizeCalculator.TryGetComputedFileSize(e.SourceItem.GetParsingPath(), out _))
+						if (sizeCalculator.TryGetComputedFileSize(sourcePath, out _))
 							fsProgress.AddProcessedItemsCount(1);
 					}
 
 					shellOperationResult.Items.Add(new ShellOperationItemResult()
 					{
 						Succeeded = e.Result.Succeeded,
-						Source = e.SourceItem.GetParsingPath(),
-						Destination = e.DestItem.GetParsingPath(),
+						Source = sourcePath,
+						Destination = e.DestItem?.GetParsingPath(),
 						HResult = (int)e.Result
 					});
 
@@ -373,11 +381,13 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 				var renameTcs = new TaskCompletionSource<bool>();
 				op.PostRenameItem += (s, e) =>
 				{
+					var sourcePath = e.SourceItem.GetParsingPath();
+					var sourceFolderPath = sourcePath is null ? null : Path.GetDirectoryName(sourcePath);
 					shellOperationResult.Items.Add(new ShellOperationItemResult()
 					{
 						Succeeded = e.Result.Succeeded,
-						Source = e.SourceItem.GetParsingPath(),
-						Destination = !string.IsNullOrEmpty(e.Name) ? Path.Combine(Path.GetDirectoryName(e.SourceItem.GetParsingPath()), e.Name) : null,
+						Source = sourcePath,
+						Destination = sourceFolderPath is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(sourceFolderPath, e.Name) : null,
 						HResult = (int)e.Result
 					});
 				};
@@ -459,7 +469,9 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 					if (!SafetyExtensions.IgnoreExceptions(() =>
 					{
 						using ShellItem shi = new(fileToMovePath[i]);
-						using ShellFolder shd = new(Path.GetDirectoryName(moveDestination[i]));
+						var destinationFolderPath = Path.GetDirectoryName(moveDestination[i])
+							?? throw new ArgumentException("The move destination must include a parent folder.", nameof(moveDestination));
+						using ShellFolder shd = new(destinationFolderPath);
 
 						op.QueueMoveOperation(shi, shd, Path.GetFileName(moveDestination[i]));
 					}))
@@ -482,24 +494,31 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 
 				op.PreMoveItem += (s, e) =>
 				{
-					sizeCalculator.ForceComputeFileSize(e.SourceItem.GetParsingPath());
-					fsProgress.FileName = e.SourceItem.Name;
+					if (e.SourceItem is not { } sourceItem)
+						return;
+
+					if (sourceItem.GetParsingPath() is { } sourcePath)
+						sizeCalculator.ForceComputeFileSize(sourcePath);
+					fsProgress.FileName = sourceItem.Name ?? string.Empty;
 					fsProgress.Report();
 				};
 
 				op.PostMoveItem += (s, e) =>
 				{
-					if (!e.SourceItem.IsFolder)
+					var sourceItem = e.SourceItem;
+					var sourcePath = sourceItem?.GetParsingPath();
+					if (sourceItem is { IsFolder: false } && sourcePath is not null)
 					{
-						if (sizeCalculator.TryGetComputedFileSize(e.SourceItem.GetParsingPath(), out _))
+						if (sizeCalculator.TryGetComputedFileSize(sourcePath, out _))
 							fsProgress.AddProcessedItemsCount(1);
 					}
 
+					var destinationFolderPath = e.DestFolder?.GetParsingPath();
 					shellOperationResult.Items.Add(new ShellOperationItemResult()
 					{
 						Succeeded = e.Result.Succeeded,
-						Source = e.SourceItem.GetParsingPath(),
-						Destination = e.DestFolder.GetParsingPath() is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.GetParsingPath(), e.Name) : null,
+						Source = sourcePath,
+						Destination = destinationFolderPath is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(destinationFolderPath, e.Name) : null,
 						HResult = (int)e.Result
 					});
 
@@ -597,7 +616,9 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 					if (!SafetyExtensions.IgnoreExceptions(() =>
 					{
 						using ShellItem shi = new(fileToCopyPath[i]);
-						using ShellFolder shd = new(Path.GetDirectoryName(copyDestination[i]));
+						var destinationFolderPath = Path.GetDirectoryName(copyDestination[i])
+							?? throw new ArgumentException("The copy destination must include a parent folder.", nameof(copyDestination));
+						using ShellFolder shd = new(destinationFolderPath);
 
 						var fileName = GetIncrementalName(overwriteOnCopy, copyDestination[i], fileToCopyPath[i]);
 						// Perform a copy operation
@@ -622,24 +643,31 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 
 				op.PreCopyItem += (s, e) =>
 				{
-					sizeCalculator.ForceComputeFileSize(e.SourceItem.GetParsingPath());
-					fsProgress.FileName = e.SourceItem.Name;
+					if (e.SourceItem is not { } sourceItem)
+						return;
+
+					if (sourceItem.GetParsingPath() is { } sourcePath)
+						sizeCalculator.ForceComputeFileSize(sourcePath);
+					fsProgress.FileName = sourceItem.Name ?? string.Empty;
 					fsProgress.Report();
 				};
 
 				op.PostCopyItem += (s, e) =>
 				{
-					if (!e.SourceItem.IsFolder)
+					var sourceItem = e.SourceItem;
+					var sourcePath = sourceItem?.GetParsingPath();
+					if (sourceItem is { IsFolder: false } && sourcePath is not null)
 					{
-						if (sizeCalculator.TryGetComputedFileSize(e.SourceItem.GetParsingPath(), out _))
+						if (sizeCalculator.TryGetComputedFileSize(sourcePath, out _))
 							fsProgress.AddProcessedItemsCount(1);
 					}
 
+					var destinationFolderPath = e.DestFolder?.GetParsingPath();
 					shellOperationResult.Items.Add(new ShellOperationItemResult()
 					{
 						Succeeded = e.Result.Succeeded,
-						Source = e.SourceItem.GetParsingPath(),
-						Destination = e.DestFolder.GetParsingPath() is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.GetParsingPath(), e.Name) : null,
+						Source = sourcePath,
+						Destination = destinationFolderPath is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(destinationFolderPath, e.Name) : null,
 						HResult = (int)e.Result
 					});
 
@@ -722,9 +750,9 @@ public static void TryCancelOperation(string operationId)
 					targetPath = await STATask.Run(() =>
 					{
 						var ipf = new Url.IUniformResourceLocator();
-						(ipf as System.Runtime.InteropServices.ComTypes.IPersistFile).Load(linkPath, 0);
+						((System.Runtime.InteropServices.ComTypes.IPersistFile)ipf).Load(linkPath, 0);
 						ipf.GetUrl(out var retVal);
-						return retVal;
+						return retVal ?? string.Empty;
 					}, App.Logger);
 					return string.IsNullOrEmpty(targetPath) ?
 						new ShellLinkItem
@@ -753,10 +781,11 @@ public static void TryCancelOperation(string operationId)
 			}
 		}
 
-		public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string targetPath, string arguments = "", string workingDirectory = "", bool runAsAdmin = false, SHOW_WINDOW_CMD showWindowCommand = SHOW_WINDOW_CMD.SW_NORMAL)
+		public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string? targetPath, string? arguments = "", string? workingDirectory = "", bool runAsAdmin = false, SHOW_WINDOW_CMD showWindowCommand = SHOW_WINDOW_CMD.SW_NORMAL)
 		{
 			try
 			{
+				ArgumentNullException.ThrowIfNull(targetPath);
 				if (FileExtensionHelpers.IsShortcutFile(linkSavePath))
 				{
 					using var newLink = new ShellLink(targetPath, arguments, workingDirectory);
@@ -778,7 +807,7 @@ public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string tar
 					{
 						var ipf = new Url.IUniformResourceLocator();
 						ipf.SetUrl(targetPath, Url.IURL_SETURL_FLAGS.IURL_SETURL_FL_GUESS_PROTOCOL);
-						(ipf as System.Runtime.InteropServices.ComTypes.IPersistFile).Save(linkSavePath, false); // Overwrite if exists
+						((System.Runtime.InteropServices.ComTypes.IPersistFile)ipf).Save(linkSavePath, false); // Overwrite if exists
 						return true;
 					}, App.Logger);
 				}
@@ -968,14 +997,14 @@ private static bool TrySetLnkShortcutIcon(string filePath, string iconFile, int
 		private static void UpdateFileTagsDb(ShellFileOperations2.ShellFileOpEventArgs e, string operationType)
 		{
 			var dbInstance = FileTagsHelper.GetDbInstance();
-			if (e.Result.Succeeded)
+			if (e.Result.Succeeded && e.SourceItem.GetParsingPath() is { } sourcePath)
 			{
-				var sourcePath = e.SourceItem.GetParsingPath();
 				var destPath = e.DestFolder.GetParsingPath();
+				var sourceFolderPath = Path.GetDirectoryName(sourcePath);
 				var destination = operationType switch
 				{
 					"delete" => e.DestItem.GetParsingPath(),
-					"rename" => !string.IsNullOrEmpty(e.Name) ? Path.Combine(Path.GetDirectoryName(sourcePath), e.Name) : null,
+					"rename" => sourceFolderPath is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(sourceFolderPath, e.Name) : null,
 					"copy" => destPath is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(destPath, e.Name) : null,
 					_ => destPath is not null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(destPath, e.Name) : null
 				};
@@ -1122,11 +1151,8 @@ protected override void Dispose(bool disposing)
 			}
 		}
 
-		private static string GetIncrementalName(bool overWriteOnCopy, string? filePathToCheck, string? filePathToCopy)
+		private static string GetIncrementalName(bool overWriteOnCopy, string filePathToCheck, string filePathToCopy)
 		{
-			if (filePathToCheck == null)
-				return null;
-
 			if ((!Path.Exists(filePathToCheck)) || overWriteOnCopy || filePathToCheck == filePathToCopy)
 				return Path.GetFileName(filePathToCheck);
 
diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs
index e930860a5155..7ca9c669b735 100644
--- a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs
+++ b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs
@@ -154,11 +154,11 @@ showDialog is DeleteConfirmationPolicies.PermanentOnly &&
 			var sw = new Stopwatch();
 			sw.Start();
 
-			IStorageHistory history = await filesystemOperations.DeleteItemsAsync((IList<IStorageItemWithPath>)source, banner.ProgressEventSource, permanently, token);
+			IStorageHistory? history = await filesystemOperations.DeleteItemsAsync((IList<IStorageItemWithPath>)source, banner.ProgressEventSource, permanently, token);
 			banner.Progress.ReportStatus(FileSystemStatusCode.Success);
 			await Task.Yield();
 
-			if (!permanently && registerHistory)
+			if (!permanently && registerHistory && history is not null)
 				App.HistoryWrapper.AddHistory(history);
 
 			// Execute removal tasks concurrently in background
@@ -184,16 +184,20 @@ public Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, DeleteCon
 			=> DeleteItemsAsync(source.CreateEnumerable(), showDialog, permanently, registerHistory);
 
 		public Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItem> source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)
-			=> DeleteItemsAsync(source.Select((item) => item.FromStorageItem()), showDialog, permanently, registerHistory);
+			=> DeleteItemsAsync(source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for deletion.")), showDialog, permanently, registerHistory);
 
 		public Task<ReturnResult> DeleteItemAsync(IStorageItem source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)
-			=> DeleteItemAsync(source.FromStorageItem(), showDialog, permanently, registerHistory);
+			=> DeleteItemAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for deletion."), showDialog, permanently, registerHistory);
 
 		public Task<ReturnResult> RestoreItemFromTrashAsync(IStorageItem source, string destination, bool registerHistory)
-			=> RestoreItemFromTrashAsync(source.FromStorageItem(), destination, registerHistory);
+			=> RestoreItemFromTrashAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for restoration."), destination, registerHistory);
 
 		public Task<ReturnResult> RestoreItemsFromTrashAsync(IEnumerable<IStorageItem> source, IEnumerable<string> destination, bool registerHistory)
-			=> RestoreItemsFromTrashAsync(source.Select((item) => item.FromStorageItem()), destination, registerHistory);
+			=> RestoreItemsFromTrashAsync(source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for restoration.")), destination, registerHistory);
 
 		public Task<ReturnResult> RestoreItemFromTrashAsync(IStorageItemWithPath source, string destination, bool registerHistory)
 			=> RestoreItemsFromTrashAsync(source.CreateEnumerable(), destination.CreateEnumerable(), registerHistory);
@@ -210,10 +214,10 @@ public async Task<ReturnResult> RestoreItemsFromTrashAsync(IEnumerable<IStorageI
 			var sw = new Stopwatch();
 			sw.Start();
 
-			IStorageHistory history = await filesystemOperations.RestoreItemsFromTrashAsync((IList<IStorageItemWithPath>)source, (IList<string>)destination, progress, cancellationToken);
+			IStorageHistory? history = await filesystemOperations.RestoreItemsFromTrashAsync((IList<IStorageItemWithPath>)source, (IList<string>)destination, progress, cancellationToken);
 			await Task.Yield();
 
-			if (registerHistory && source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))
+			if (registerHistory && history is not null && source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))
 			{
 				App.HistoryWrapper.AddHistory(history);
 			}
@@ -281,10 +285,12 @@ public async Task<ReturnResult> PerformOperationTypeAsync(
 		}
 
 		public Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItem> source, IEnumerable<string> destination, bool showDialog, bool registerHistory)
-			=> CopyItemsAsync(source.Select((item) => item.FromStorageItem()), destination, showDialog, registerHistory);
+			=> CopyItemsAsync(source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for copying.")), destination, showDialog, registerHistory);
 
 		public Task<ReturnResult> CopyItemAsync(IStorageItem source, string destination, bool showDialog, bool registerHistory)
-			=> CopyItemAsync(source.FromStorageItem(), destination, showDialog, registerHistory);
+			=> CopyItemAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for copying."), destination, showDialog, registerHistory);
 
 		public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath> source, IEnumerable<string> destination, bool showDialog, bool registerHistory)
 		{
@@ -313,21 +319,24 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
 
 			itemManipulationModel?.ClearSelection();
 
-			IStorageHistory history = await filesystemOperations.CopyItemsAsync((IList<IStorageItemWithPath>)source, (IList<string>)destination, collisions, banner.ProgressEventSource, token);
+			IStorageHistory? history = await filesystemOperations.CopyItemsAsync((IList<IStorageItemWithPath>)source, (IList<string>)destination, collisions, banner.ProgressEventSource, token);
 
 			if (returnStatus == ReturnResult.InProgress || returnStatus == ReturnResult.Success)
 				banner.Progress.ReportStatus(FileSystemStatusCode.Success);
 
-			if (registerHistory && history is not null && source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))
+			if (registerHistory &&
+				history?.Destination is { } historyDestinations &&
+				source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))
 			{
-				foreach (var (histSrcItem, histDestItem) in history.Source.Zip(history.Destination))
+				foreach (var (histSrcItem, histDestItem) in history.Source.Zip(historyDestinations))
 				{
 					foreach (var conflictItem in itemsResult)
 					{
 						if (!string.IsNullOrEmpty(conflictItem.CustomName) && conflictItem.SourcePath == histSrcItem.Path && Path.GetFileName(conflictItem.SourcePath) != conflictItem.CustomName)
 						{
 							var renameHistory = await filesystemOperations.RenameAsync(histDestItem, conflictItem.CustomName, NameCollisionOption.FailIfExists, banner.ProgressEventSource, token);
-							history.Destination[history.Source.IndexOf(histSrcItem)] = renameHistory.Destination[0];
+							if (renameHistory?.Destination is { Count: > 0 } renameDestinations)
+								historyDestinations[history.Source.IndexOf(histSrcItem)] = renameDestinations[0];
 						}
 					}
 				}
@@ -391,6 +400,9 @@ public async Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageVi
 					var imgSource = await packageView.GetBitmapAsync();
 					using var imageStream = await imgSource.OpenReadAsync();
 					var folder = await StorageFileExtensions.DangerousGetFolderFromPathAsync(destination);
+					if (folder is null)
+						return ReturnResult.Failed;
+
 					// Set the name of the file to be the current time and date
 					var file = await folder.CreateFileAsync($"{DateTime.Now:MM-dd-yy-HHmmss}.png", CreationCollisionOption.GenerateUniqueName);
 
@@ -416,10 +428,12 @@ public async Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageVi
 		}
 
 		public Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItem> source, IEnumerable<string> destination, bool showDialog, bool registerHistory)
-			=> MoveItemsAsync(source.Select((item) => item.FromStorageItem()), destination, showDialog, registerHistory);
+			=> MoveItemsAsync(source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for moving.")), destination, showDialog, registerHistory);
 
 		public Task<ReturnResult> MoveItemAsync(IStorageItem source, string destination, bool showDialog, bool registerHistory)
-			=> MoveItemAsync(source.FromStorageItem(), destination, showDialog, registerHistory);
+			=> MoveItemAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for moving."), destination, showDialog, registerHistory);
 
 		public async Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItemWithPath> source, IEnumerable<string> destination, bool showDialog, bool registerHistory)
 		{
@@ -452,23 +466,26 @@ public async Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItemWithPath>
 
 			itemManipulationModel?.ClearSelection();
 
-			IStorageHistory history = await filesystemOperations.MoveItemsAsync((IList<IStorageItemWithPath>)source, (IList<string>)destination, collisions, banner.ProgressEventSource, token);
+			IStorageHistory? history = await filesystemOperations.MoveItemsAsync((IList<IStorageItemWithPath>)source, (IList<string>)destination, collisions, banner.ProgressEventSource, token);
 
 			if (returnStatus == ReturnResult.InProgress || returnStatus == ReturnResult.Success)
 				banner.Progress.ReportStatus(FileSystemStatusCode.Success);
 
 			await Task.Yield();
 
-			if (registerHistory && history is not null && source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))
+			if (registerHistory &&
+				history?.Destination is { } historyDestinations &&
+				source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))
 			{
-				foreach (var (histSrcItem, histDestItem) in history.Source.Zip(history.Destination))
+				foreach (var (histSrcItem, histDestItem) in history.Source.Zip(historyDestinations))
 				{
 					foreach (var conflictItem in itemsResult)
 					{
 						if (!string.IsNullOrEmpty(conflictItem.CustomName) && conflictItem.SourcePath == histSrcItem.Path)
 						{
 							var renameHistory = await filesystemOperations.RenameAsync(histDestItem, conflictItem.CustomName, NameCollisionOption.FailIfExists, banner.ProgressEventSource, token);
-							history.Destination[history.Source.IndexOf(histSrcItem)] = renameHistory.Destination[0];
+							if (renameHistory?.Destination is { Count: > 0 } renameDestinations)
+								historyDestinations[history.Source.IndexOf(histSrcItem)] = renameDestinations[0];
 						}
 					}
 				}
@@ -533,7 +550,8 @@ public async Task<ReturnResult> MoveItemsFromClipboard(DataPackageView packageVi
 		}
 
 		public Task<ReturnResult> RenameAsync(IStorageItem source, string newName, NameCollisionOption collision, bool registerHistory, bool showExtensionDialog = true)
-			=> RenameAsync(source.FromStorageItem(), newName, collision, registerHistory, showExtensionDialog);
+			=> RenameAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for renaming."), newName, collision, registerHistory, showExtensionDialog);
 
 		public async Task<ReturnResult> RenameAsync(IStorageItemWithPath source, string newName, NameCollisionOption collision, bool registerHistory, bool showExtensionDialog = true)
 		{
@@ -653,7 +671,7 @@ public static bool IsValidForFilename(string name)
 
 			foreach (var (src, dest) in source.Zip(destination))
 			{
-				string itemPathOrName = string.IsNullOrEmpty(src.Path) ? src.Item.Name : src.Path;
+				string itemPathOrName = string.IsNullOrEmpty(src.Path) ? src.Name : src.Path;
 				var incomingItem = new FileSystemDialogConflictItemViewModel
 				{
 					ConflictResolveOption = FileNameConflictResolveOptionType.None,
@@ -666,7 +684,7 @@ public static bool IsValidForFilename(string name)
 				{
 					// Something strange happened, log
 					App.Logger.LogWarning($"Duplicate key when resolving conflicts: {itemPathOrName}, {src.Name}\n" +
-						$"Source: {string.Join(", ", source.Select(x => string.IsNullOrEmpty(x.Path) ? x.Item.Name : x.Path))}");
+						$"Source: {string.Join(", ", source.Select(x => string.IsNullOrEmpty(x.Path) ? x.Name : x.Path))}");
 				}
 
 				// Assume GenerateNewName when source and destination are the same
@@ -713,7 +731,8 @@ await Ioc.Default.GetRequiredService<IFtpStorageService>().TryGetFileAsync(dest)
 				collisions.Clear();
 				foreach (var item in itemsResult)
 				{
-					collisions.TryAdd(item.SourcePath!, item.ConflictResolveOption);
+					if (!string.IsNullOrEmpty(item.SourcePath))
+						collisions.TryAdd(item.SourcePath, item.ConflictResolveOption);
 				}
 			}
 
@@ -722,7 +741,7 @@ await Ioc.Default.GetRequiredService<IFtpStorageService>().TryGetFileAsync(dest)
 
 			foreach (var src in source)
 			{
-				var itemPathOrName = string.IsNullOrEmpty(src.Path) ? src.Item.Name : src.Path;
+				var itemPathOrName = string.IsNullOrEmpty(src.Path) ? src.Name : src.Path;
 				bool found = collisions.TryGetValue(itemPathOrName, out var match);
 				var fileNameConflictResolveOptionType = found ? match : FileNameConflictResolveOptionType.Skip;
 				newCollisions.Add(fileNameConflictResolveOptionType);
@@ -746,7 +765,8 @@ public static async Task<IEnumerable<IStorageItemWithPath>> GetDraggedStorageIte
 				try
 				{
 					var source = await packageView.GetStorageItemsAsync();
-					itemsList.AddRange(source.Select(x => x.FromStorageItem()));
+					itemsList.AddRange(source.Select(item => item.FromStorageItem()
+						?? throw new InvalidOperationException("A dragged storage item could not be converted.")));
 				}
 				catch (Exception ex) when ((uint)ex.HResult == 0x80040064 || (uint)ex.HResult == 0x8004006A)
 				{
@@ -768,11 +788,11 @@ public static async Task<IEnumerable<IStorageItemWithPath>> GetDraggedStorageIte
 					for (var ii = 0; ii < descriptor.cItems; ii++)
 					{
 						if (descriptor.fgd[ii].dwFileAttributes.HasFlag(FileFlagsAndAttributes.FILE_ATTRIBUTE_DIRECTORY))
-							itemsList.Add(new VirtualStorageFolder(descriptor.fgd[ii].cFileName).FromStorageItem());
+							itemsList.Add(new VirtualStorageFolder(descriptor.fgd[ii].cFileName).FromStorageItem()!);
 						else if (NativeClipboard.CurrentDataObject.GetData("FileContents", DVASPECT.DVASPECT_CONTENT, ii) is IStream stream)
 						{
 							var streamContent = new ComStreamWrapper(stream);
-							itemsList.Add(new VirtualStorageFile(streamContent, descriptor.fgd[ii].cFileName).FromStorageItem());
+							itemsList.Add(new VirtualStorageFile(streamContent, descriptor.fgd[ii].cFileName).FromStorageItem()!);
 						}
 					}
 				}
@@ -842,7 +862,7 @@ public static async Task<IEnumerable<IStorageItemWithPath>> GetDraggedStorageIte
 				}
 			}
 
-			itemsList = itemsList.DistinctBy(x => string.IsNullOrEmpty(x.Path) ? x.Item.Name : x.Path).ToList();
+			itemsList = itemsList.DistinctBy(x => string.IsNullOrEmpty(x.Path) ? x.Name : x.Path).ToList();
 			return itemsList;
 		}
 
@@ -876,7 +896,7 @@ public static bool ContainsRestrictedFileName(string input)
 		/// <summary>
 		/// Gets the shortcut naming template from File Explorer
 		/// </summary>
-		public static string GetShortcutNamingPreference(string itemName)
+		public static string GetShortcutNamingPreference(string? itemName)
 		{
 			var keyName = @"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\NamingTemplates";
 			var value = Registry.GetValue(keyName, "ShortcutNameTemplate", null);
diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs
index 080397e1b89a..b44afd323619 100644
--- a/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs
+++ b/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs
@@ -18,16 +18,20 @@ public sealed partial class FilesystemOperations : IFilesystemOperations
 	{
 		private readonly IStorageTrashBinService StorageTrashBinService = Ioc.Default.GetRequiredService<IStorageTrashBinService>();
 
-		private IShellPage _associatedInstance;
+		private IShellPage? _associatedInstance;
+		private IShellPage AssociatedInstance
+			=> _associatedInstance ?? throw new ObjectDisposedException(nameof(FilesystemOperations));
+		private ShellViewModel ShellViewModel
+			=> AssociatedInstance.GetRequiredShellViewModel();
 
 		public FilesystemOperations(IShellPage associatedInstance)
 		{
 			_associatedInstance = associatedInstance;
 		}
 
-		public async Task<(IStorageHistory, IStorageItem)> CreateAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
+		public async Task<(IStorageHistory?, IStorageItem?)> CreateAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
 		{
-			IStorageItemWithPath item = null;
+			IStorageItemWithPath? item = null;
 			FilesystemResult fsResult = (FilesystemResult)false;
 			StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress, 1);
 			fsProgress.Report();
@@ -41,13 +45,19 @@ public FilesystemOperations(IShellPage associatedInstance)
 							var newEntryInfo = await ShellNewEntryExtensions.GetNewContextMenuEntryForType(Path.GetExtension(source.Path));
 							if (newEntryInfo is null)
 							{
-								var fsFolderResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(source.Path));
+								var fsFolderResult = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(source.Path));
 								fsResult = fsFolderResult;
 								if (fsResult)
 								{
-									var fsCreateResult = await FilesystemTasks.Wrap(() => fsFolderResult.Result.CreateFileAsync(Path.GetFileName(source.Path), CreationCollisionOption.GenerateUniqueName).AsTask());
+									var folder = fsFolderResult.Result
+										?? throw new InvalidOperationException("The destination folder could not be opened for file creation.");
+									var fileName = Path.GetFileName(source.Path)!;
+									var fsCreateResult = await FilesystemTasks.Wrap(() => folder.CreateFileAsync(fileName, CreationCollisionOption.GenerateUniqueName).AsTask());
 									fsResult = fsCreateResult;
-									item = fsCreateResult.Result.FromStorageItem();
+									var createdFile = fsCreateResult.Result;
+									if (fsCreateResult && createdFile is null)
+										throw new InvalidOperationException("The file creation completed without returning the created file.");
+									item = createdFile?.FromStorageItem();
 								}
 								if (fsResult == FileSystemStatusCode.Unauthorized)
 								{
@@ -56,12 +66,11 @@ public FilesystemOperations(IShellPage associatedInstance)
 							}
 							else
 							{
-								var fsCreateResult = await newEntryInfo.Create(source.Path, _associatedInstance);
+								var fsCreateResult = await newEntryInfo.Create(source.Path, AssociatedInstance);
 								fsResult = fsCreateResult;
-								if (fsResult)
-								{
-									item = fsCreateResult.Result.FromStorageItem();
-								}
+								if (fsResult && fsCreateResult.Result is null)
+									throw new InvalidOperationException("The file creation completed without returning the created file.");
+								item = fsCreateResult.Result?.FromStorageItem();
 								if (fsResult == FileSystemStatusCode.Unauthorized)
 								{
 									// Can't do anything, already tried with admin FTP
@@ -73,13 +82,19 @@ public FilesystemOperations(IShellPage associatedInstance)
 
 					case FilesystemItemType.Directory:
 						{
-							var fsFolderResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(source.Path));
+							var fsFolderResult = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(source.Path));
 							fsResult = fsFolderResult;
 							if (fsResult)
 							{
-								var fsCreateResult = await FilesystemTasks.Wrap(() => fsFolderResult.Result.CreateFolderAsync(Path.GetFileName(source.Path), CreationCollisionOption.GenerateUniqueName).AsTask());
+								var folder = fsFolderResult.Result
+									?? throw new InvalidOperationException("The destination folder could not be opened for folder creation.");
+								var folderName = Path.GetFileName(source.Path)!;
+								var fsCreateResult = await FilesystemTasks.Wrap(() => folder.CreateFolderAsync(folderName, CreationCollisionOption.GenerateUniqueName).AsTask());
 								fsResult = fsCreateResult;
-								item = fsCreateResult.Result.FromStorageItem();
+								var createdFolder = fsCreateResult.Result;
+								if (fsCreateResult && createdFolder is null)
+									throw new InvalidOperationException("The folder creation completed without returning the created folder.");
+								item = createdFolder?.FromStorageItem();
 							}
 							if (fsResult == FileSystemStatusCode.Unauthorized)
 							{
@@ -106,12 +121,13 @@ public FilesystemOperations(IShellPage associatedInstance)
 			}
 		}
 
-		public Task<IStorageHistory> CopyAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> CopyAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel>? progress, CancellationToken cancellationToken)
 		{
-			return CopyAsync(source.FromStorageItem(), destination, collision, progress, cancellationToken);
+			return CopyAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for copying."), destination, collision, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> CopyAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> CopyAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel>? progress, CancellationToken cancellationToken)
 		{
 			StatusCenterItemProgressModel fsProgress = new(
 				progress,
@@ -132,7 +148,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 				return null;
 			}
 
-			IStorageItem copiedItem = null;
+			IStorageItem? copiedItem = null;
 
 			if (source.ItemType == FilesystemItemType.Directory)
 			{
@@ -166,17 +182,19 @@ await DialogDisplayHelper.ShowDialogAsync(
 				{
 					// CopyFileFromApp only works on file not directories
 					var fsSourceFolder = await source.ToStorageItemResult();
-					var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
+					var fsDestinationFolder = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 					var fsResult = (FilesystemResult)(fsSourceFolder.ErrorCode | fsDestinationFolder.ErrorCode);
 
-					if (fsResult)
+					if (fsResult &&
+						fsSourceFolder.Result is BaseStorageFolder sourceFolder &&
+						fsDestinationFolder.Result is BaseStorageFolder destinationFolder)
 					{
-						if (fsSourceFolder.Result is IPasswordProtectedItem ppis)
+						if (sourceFolder is IPasswordProtectedItem ppis)
 							ppis.PasswordRequestedCallback = UIFilesystemHelpers.RequestPassword;
 
-						var fsCopyResult = await FilesystemTasks.Wrap(() => CloneDirectoryAsync((BaseStorageFolder)fsSourceFolder, (BaseStorageFolder)fsDestinationFolder, fsSourceFolder.Result.Name, collision.Convert()));
+						var fsCopyResult = await FilesystemTasks.Wrap(() => CloneDirectoryAsync(sourceFolder, destinationFolder, sourceFolder.Name, collision.Convert()));
 
-						if (fsSourceFolder.Result is IPasswordProtectedItem ppiu)
+						if (sourceFolder is IPasswordProtectedItem ppiu)
 							ppiu.PasswordRequestedCallback = null;
 
 						if (fsCopyResult == FileSystemStatusCode.AlreadyExists)
@@ -186,19 +204,26 @@ await DialogDisplayHelper.ShowDialogAsync(
 							return null;
 						}
 
-						if (fsCopyResult)
+						if (fsCopyResult && fsCopyResult.Result is null)
+							fsCopyResult = new FilesystemResult<BaseStorageFolder>(null, FileSystemStatusCode.Generic);
+
+						if (fsCopyResult.Result is { } copiedFolder)
 						{
 							if (Win32Helper.HasFileAttribute(source.Path, SystemIO.FileAttributes.Hidden))
 							{
 								// The source folder was hidden, apply hidden attribute to destination
-								Win32Helper.SetFileAttribute(fsCopyResult.Result.Path, SystemIO.FileAttributes.Hidden);
+								Win32Helper.SetFileAttribute(copiedFolder.Path, SystemIO.FileAttributes.Hidden);
 							}
 
-							copiedItem = (BaseStorageFolder)fsCopyResult;
+							copiedItem = copiedFolder;
 						}
 
 						fsResult = fsCopyResult;
 					}
+					else if (fsResult)
+					{
+						fsResult = FileSystemStatusCode.Generic;
+					}
 
 					if (fsResult == FileSystemStatusCode.Unauthorized)
 					{
@@ -219,16 +244,17 @@ await DialogDisplayHelper.ShowDialogAsync(
 				{
 					Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
 
-					FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
+					FilesystemResult<BaseStorageFolder> destinationResult = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 					var sourceResult = await source.ToStorageItemResult();
 					fsResult = sourceResult.ErrorCode | destinationResult.ErrorCode;
 
-					if (fsResult)
+					if (fsResult &&
+						sourceResult.Result is BaseStorageFile file &&
+						destinationResult.Result is { } destinationFolder)
 					{
-						if (sourceResult.Result is IPasswordProtectedItem ppis)
+						if (file is IPasswordProtectedItem ppis)
 							ppis.PasswordRequestedCallback = UIFilesystemHelpers.RequestPassword;
 
-						var file = (BaseStorageFile)sourceResult;
 						var fsResultCopy = new FilesystemResult<BaseStorageFile>(null, FileSystemStatusCode.Generic);
 						if (string.IsNullOrEmpty(file.Path) && collision == NameCollisionOption.GenerateUniqueName)
 						{
@@ -242,16 +268,16 @@ await DialogDisplayHelper.ShowDialogAsync(
 
 							do
 							{
-								fsResultCopy = await FilesystemTasks.Wrap(() => file.CopyAsync(destinationResult.Result, desiredNewName, NameCollisionOption.FailIfExists).AsTask());
+								fsResultCopy = await FilesystemTasks.WrapNullable(() => file.CopyAsync(destinationFolder, desiredNewName, NameCollisionOption.FailIfExists).AsTask());
 								desiredNewName = $"{nameWithoutExt} ({attempt}){extension}";
 							} while (fsResultCopy.ErrorCode == FileSystemStatusCode.AlreadyExists && ++attempt < 1024);
 						}
 						else
 						{
-							fsResultCopy = await FilesystemTasks.Wrap(() => file.CopyAsync(destinationResult.Result, Path.GetFileName(file.Name), collision).AsTask());
+							fsResultCopy = await FilesystemTasks.WrapNullable(() => file.CopyAsync(destinationFolder, Path.GetFileName(file.Name)!, collision).AsTask());
 						}
 
-						if (sourceResult.Result is IPasswordProtectedItem ppiu)
+						if (file is IPasswordProtectedItem ppiu)
 							ppiu.PasswordRequestedCallback = null;
 
 						if (fsResultCopy == FileSystemStatusCode.AlreadyExists)
@@ -261,11 +287,18 @@ await DialogDisplayHelper.ShowDialogAsync(
 							return null;
 						}
 
-						if (fsResultCopy)
-							copiedItem = fsResultCopy.Result;
+						if (fsResultCopy && fsResultCopy.Result is null)
+							fsResultCopy = new FilesystemResult<BaseStorageFile>(null, FileSystemStatusCode.Generic);
+
+						if (fsResultCopy.Result is { } copiedFile)
+							copiedItem = copiedFile;
 
 						fsResult = fsResultCopy;
 					}
+					else if (fsResult)
+					{
+						fsResult = FileSystemStatusCode.Generic;
+					}
 
 					if (fsResult == FileSystemStatusCode.Unauthorized)
 					{
@@ -292,12 +325,13 @@ await DialogDisplayHelper.ShowDialogAsync(
 			return new StorageHistory(FileOperationType.Copy, source, pathWithType);
 		}
 
-		public Task<IStorageHistory> MoveAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> MoveAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel>? progress, CancellationToken cancellationToken)
 		{
-			return MoveAsync(source.FromStorageItem(), destination, collision, progress, cancellationToken);
+			return MoveAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for moving."), destination, collision, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> MoveAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> MoveAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel>? progress, CancellationToken cancellationToken)
 		{
 			StatusCenterItemProgressModel fsProgress = new(
 				progress,
@@ -333,7 +367,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 				return null;
 			}
 
-			IStorageItem movedItem = null;
+			IStorageItem? movedItem = null;
 
 			if (source.ItemType == FilesystemItemType.Directory)
 			{
@@ -373,16 +407,17 @@ await DialogDisplayHelper.ShowDialogAsync(
 						Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
 
 						var fsSourceFolder = await source.ToStorageItemResult();
-						var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
+						var fsDestinationFolder = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 						fsResult = fsSourceFolder.ErrorCode | fsDestinationFolder.ErrorCode;
 
-						if (fsResult)
+						if (fsResult &&
+							fsSourceFolder.Result is BaseStorageFolder sourceFolder &&
+							fsDestinationFolder.Result is BaseStorageFolder destinationFolder)
 						{
-							if (fsSourceFolder.Result is IPasswordProtectedItem ppis)
+							if (sourceFolder is IPasswordProtectedItem ppis)
 								ppis.PasswordRequestedCallback = UIFilesystemHelpers.RequestPassword;
 
-							var srcFolder = (BaseStorageFolder)fsSourceFolder;
-							var fsResultMove = await FilesystemTasks.Wrap(() => srcFolder.MoveAsync(fsDestinationFolder.Result, collision).AsTask());
+							var fsResultMove = await FilesystemTasks.WrapNullable(() => sourceFolder.MoveAsync(destinationFolder, collision).AsTask());
 
 							if (!fsResultMove) // Use generic move folder operation (move folder items one by one)
 							{
@@ -390,10 +425,10 @@ await DialogDisplayHelper.ShowDialogAsync(
 								//var fsResultMove = await FilesystemTasks.Wrap(() => MoveDirectoryAsync((BaseStorageFolder)fsSourceFolder, (BaseStorageFolder)fsDestinationFolder, fsSourceFolder.Result.Name, collision.Convert(), true));
 
 								if (await DialogDisplayHelper.ShowDialogAsync(Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), Strings.ErrorDialogUnsupportedMoveOperation.GetLocalizedResource(), "OK", Strings.Cancel.GetLocalizedResource()))
-									fsResultMove = await FilesystemTasks.Wrap(() => CloneDirectoryAsync((BaseStorageFolder)fsSourceFolder, (BaseStorageFolder)fsDestinationFolder, fsSourceFolder.Result.Name, collision.Convert()));
+									fsResultMove = await FilesystemTasks.Wrap(() => CloneDirectoryAsync(sourceFolder, destinationFolder, sourceFolder.Name, collision.Convert()));
 							}
 
-							if (fsSourceFolder.Result is IPasswordProtectedItem ppiu)
+							if (sourceFolder is IPasswordProtectedItem ppiu)
 								ppiu.PasswordRequestedCallback = null;
 
 							if (fsResultMove == FileSystemStatusCode.AlreadyExists)
@@ -403,18 +438,25 @@ await DialogDisplayHelper.ShowDialogAsync(
 								return null;
 							}
 
-							if (fsResultMove)
+							if (fsResultMove && fsResultMove.Result is null)
+								fsResultMove = new FilesystemResult<BaseStorageFolder>(null, FileSystemStatusCode.Generic);
+
+							if (fsResultMove.Result is { } movedFolder)
 							{
 								if (Win32Helper.HasFileAttribute(source.Path, SystemIO.FileAttributes.Hidden))
 								{
 									// The source folder was hidden, apply hidden attribute to destination
-									Win32Helper.SetFileAttribute(fsResultMove.Result.Path, SystemIO.FileAttributes.Hidden);
+									Win32Helper.SetFileAttribute(movedFolder.Path, SystemIO.FileAttributes.Hidden);
 								}
 
-								movedItem = (BaseStorageFolder)fsResultMove;
+								movedItem = movedFolder;
 							}
 							fsResult = fsResultMove;
 						}
+						else if (fsResult)
+						{
+							fsResult = FileSystemStatusCode.Generic;
+						}
 						if (fsResult == FileSystemStatusCode.Unauthorized || fsResult == FileSystemStatusCode.ReadOnly)
 						{
 							// Cannot do anything, already tried with admin FTP
@@ -432,19 +474,20 @@ await DialogDisplayHelper.ShowDialogAsync(
 				{
 					Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
 
-					FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
+					FilesystemResult<BaseStorageFolder> destinationResult = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 					var sourceResult = await source.ToStorageItemResult();
 					fsResult = sourceResult.ErrorCode | destinationResult.ErrorCode;
 
-					if (fsResult)
+					if (fsResult &&
+						sourceResult.Result is BaseStorageFile file &&
+						destinationResult.Result is { } destinationFolder)
 					{
-						if (sourceResult.Result is IPasswordProtectedItem ppis)
+						if (file is IPasswordProtectedItem ppis)
 							ppis.PasswordRequestedCallback = UIFilesystemHelpers.RequestPassword;
 
-						var file = (BaseStorageFile)sourceResult;
-						var fsResultMove = await FilesystemTasks.Wrap(() => file.MoveAsync(destinationResult.Result, Path.GetFileName(file.Name), collision).AsTask());
+						var fsResultMove = await FilesystemTasks.Wrap(() => file.MoveAsync(destinationFolder, Path.GetFileName(file.Name)!, collision).AsTask());
 
-						if (sourceResult.Result is IPasswordProtectedItem ppiu)
+						if (file is IPasswordProtectedItem ppiu)
 							ppiu.PasswordRequestedCallback = null;
 
 						if (fsResultMove == FileSystemStatusCode.AlreadyExists)
@@ -459,6 +502,10 @@ await DialogDisplayHelper.ShowDialogAsync(
 
 						fsResult = fsResultMove;
 					}
+					else if (fsResult)
+					{
+						fsResult = FileSystemStatusCode.Generic;
+					}
 					if (fsResult == FileSystemStatusCode.Unauthorized || fsResult == FileSystemStatusCode.ReadOnly)
 					{
 						// Cannot do anything, already tried with admin FTP
@@ -473,12 +520,13 @@ await DialogDisplayHelper.ShowDialogAsync(
 				return null;
 			}
 
-			bool sourceInCurrentFolder = PathNormalization.TrimPath(_associatedInstance.ShellViewModel.CurrentFolder.ItemPath) ==
-				PathNormalization.GetParentDir(source.Path);
+			var currentFolder = ShellViewModel.CurrentFolder
+				?? throw new InvalidOperationException("The shell view model does not have a current folder.");
+			bool sourceInCurrentFolder = PathNormalization.TrimPath(currentFolder.ItemPath) == PathNormalization.GetParentDir(source.Path);
 			if (fsProgress.Status == FileSystemStatusCode.Success && sourceInCurrentFolder)
 			{
-				await _associatedInstance.ShellViewModel.RemoveFileOrFolderAsync(source.Path);
-				await _associatedInstance.ShellViewModel.ApplyFilesAndFoldersChangesAsync();
+				await ShellViewModel.RemoveFileOrFolderAsync(source.Path);
+				await ShellViewModel.ApplyFilesAndFoldersChangesAsync();
 			}
 
 			var pathWithType = movedItem.FromStorageItem(destination, source.ItemType);
@@ -486,12 +534,13 @@ await DialogDisplayHelper.ShowDialogAsync(
 			return new StorageHistory(FileOperationType.Move, source, pathWithType);
 		}
 
-		public Task<IStorageHistory> DeleteAsync(IStorageItem source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> DeleteAsync(IStorageItem source, IProgress<StatusCenterItemProgressModel>? progress, bool permanently, CancellationToken cancellationToken)
 		{
-			return DeleteAsync(source.FromStorageItem(), progress, permanently, cancellationToken);
+			return DeleteAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for deletion."), progress, permanently, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> DeleteAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel>? progress, bool permanently, CancellationToken cancellationToken)
 		{
 			StatusCenterItemProgressModel fsProgress = new(
 				progress,
@@ -512,13 +561,15 @@ public async Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IPro
 			{
 				if (source.ItemType == FilesystemItemType.File)
 				{
-					fsResult = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken)
-						.OnSuccess((t) => t.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());
+					fsResult = await ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken)
+						.OnSuccess((t) => (t ?? throw new InvalidOperationException($"The file '{source.Path}' could not be opened."))
+							.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());
 				}
 				else if (source.ItemType == FilesystemItemType.Directory)
 				{
-					fsResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken)
-						.OnSuccess((t) => t.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());
+					fsResult = await ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken)
+						.OnSuccess((t) => (t ?? throw new InvalidOperationException($"The folder '{source.Path}' could not be opened."))
+							.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());
 				}
 			}
 
@@ -537,16 +588,19 @@ public async Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IPro
 			if (deleteFromRecycleBin)
 			{
 				// Recycle bin also stores a file starting with $I for each item
-				string iFilePath = Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileName(source.Path).Replace("$R", "$I", StringComparison.Ordinal));
-
-				await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)
-					.OnSuccess(iFile => iFile.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());
+				var parentPath = Path.GetDirectoryName(source.Path)
+					?? throw new InvalidOperationException("The recycle-bin item does not have a parent path.");
+				var fileName = Path.GetFileName(source.Path)!;
+				string iFilePath = Path.Combine(parentPath, fileName.Replace("$R", "$I", StringComparison.Ordinal));
+				await ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)
+					.OnSuccess(iFile => (iFile ?? throw new InvalidOperationException($"The recycle-bin metadata file '{iFilePath}' could not be opened."))
+						.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());
 			}
 			fsProgress.ReportStatus(fsResult);
 
 			if (fsResult)
 			{
-				await _associatedInstance.ShellViewModel.RemoveFileOrFolderAsync(source.Path);
+				await ShellViewModel.RemoveFileOrFolderAsync(source.Path);
 
 				if (!permanently)
 				{
@@ -555,14 +609,23 @@ await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancell
 
 					// Get name matching files
 					if (FileExtensionHelpers.IsShortcutOrUrlFile(source.Path)) // We need to check if it is a shortcut file
-						nameMatchItems = items.Where((item) => item.FilePath == Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileNameWithoutExtension(source.Path)));
+					{
+						var parentPath = Path.GetDirectoryName(source.Path)
+							?? throw new InvalidOperationException("The recycled shortcut does not have a parent path.");
+						var fileName = Path.GetFileNameWithoutExtension(source.Path)!;
+						nameMatchItems = items.Where((item) => item.FilePath == Path.Combine(parentPath, fileName));
+					}
 					else
 						nameMatchItems = items.Where((item) => item.FilePath == source.Path);
 
 					// Get newest file
-					ShellFileItem item = nameMatchItems.OrderBy((item) => item.RecycleDate).FirstOrDefault();
+					ShellFileItem? item = nameMatchItems.OrderBy((item) => item.RecycleDate).FirstOrDefault();
+					if (item is null)
+						return null;
 
-					return new StorageHistory(FileOperationType.Recycle, source, StorageHelpers.FromPathAndType(item?.RecyclePath, source.ItemType));
+					return new StorageHistory(FileOperationType.Recycle, source, StorageHelpers.FromPathAndType(
+						item.RecyclePath ?? throw new InvalidOperationException("The recycle-bin item does not have a recycle path."),
+						source.ItemType));
 				}
 
 				return new StorageHistory(FileOperationType.Delete, source, null);
@@ -574,12 +637,13 @@ await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancell
 			}
 		}
 
-		public Task<IStorageHistory> RenameAsync(IStorageItem source, string newName, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> RenameAsync(IStorageItem source, string newName, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return RenameAsync(StorageHelpers.FromStorageItem(source), newName, collision, progress, cancellationToken);
+			return RenameAsync(StorageHelpers.FromStorageItem(source)
+				?? throw new InvalidOperationException("The storage item could not be converted for renaming."), newName, collision, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> RenameAsync(
+		public async Task<IStorageHistory?> RenameAsync(
 			IStorageItemWithPath source,
 			string newName,
 			NameCollisionOption collision,
@@ -605,6 +669,8 @@ public async Task<IStorageHistory> RenameAsync(
 				var renamed = await source.ToStorageItemResult()
 					.OnSuccess(async (t) =>
 					{
+						if (t is null)
+							throw new InvalidOperationException($"The item '{source.Path}' could not be opened for renaming.");
 						if (t.Name.Equals(newName, StringComparison.CurrentCultureIgnoreCase))
 							await t.RenameAsync(newName, NameCollisionOption.ReplaceExisting);
 						else
@@ -613,16 +679,18 @@ public async Task<IStorageHistory> RenameAsync(
 						return t;
 					});
 
-				if (renamed)
+				if (renamed.Result is { } renamedItem)
 				{
 					fsProgress.ReportStatus(FileSystemStatusCode.Success);
 
-					return new StorageHistory(FileOperationType.Rename, source, renamed.Result.FromStorageItem());
+					return new StorageHistory(FileOperationType.Rename, source, renamedItem.FromStorageItem());
 				}
 				else if (renamed == FileSystemStatusCode.Unauthorized)
 				{
 					// Try again with MoveFileFromApp
-					var destination = Path.Combine(Path.GetDirectoryName(source.Path), newName);
+					var parentPath = Path.GetDirectoryName(source.Path)
+						?? throw new InvalidOperationException("The item being renamed does not have a parent path.");
+					var destination = Path.Combine(parentPath, newName);
 					if (PInvoke.MoveFileFromApp(source.Path, destination))
 					{
 						fsProgress.ReportStatus(FileSystemStatusCode.Success);
@@ -680,12 +748,13 @@ public async Task<IStorageHistory> RenameAsync(
 			return null;
 		}
 
-		public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItem> source, IList<string> destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> RestoreItemsFromTrashAsync(IList<IStorageItem> source, IList<string> destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return await RestoreItemsFromTrashAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), destination, progress, cancellationToken);
+			return await RestoreItemsFromTrashAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for restoration.")).ToListAsync(), destination, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> RestoreItemsFromTrashAsync(
+		public async Task<IStorageHistory?> RestoreItemsFromTrashAsync(
 			IList<IStorageItemWithPath> source,
 			IList<string> destination,
 			IProgress<StatusCenterItemProgressModel> progress,
@@ -695,7 +764,7 @@ public async Task<IStorageHistory> RestoreItemsFromTrashAsync(
 			StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress, source.Count);
 			fsProgress.Report();
 
-			var rawStorageHistory = new List<IStorageHistory>();
+			var rawStorageHistory = new List<IStorageHistory?>();
 
 			for (int i = 0; i < source.Count; i++)
 			{
@@ -709,23 +778,25 @@ public async Task<IStorageHistory> RestoreItemsFromTrashAsync(
 
 			}
 
-			if (rawStorageHistory.Any() && rawStorageHistory.All((item) => item is not null))
+			if (rawStorageHistory.Count > 0 && rawStorageHistory.All(item => item is not null))
 			{
+				var storageHistory = rawStorageHistory.WhereNotNull().ToList();
 				return new StorageHistory(
-					rawStorageHistory[0].OperationType,
-					await rawStorageHistory.SelectMany((item) => item.Source).ToListAsync(),
-					await rawStorageHistory.SelectMany((item) => item.Destination).ToListAsync());
+					storageHistory[0].OperationType,
+					await storageHistory.SelectMany(item => item.Source).ToListAsync(),
+					await storageHistory.SelectMany(item => item.Destination!).ToListAsync());
 			}
 
 			return null;
 		}
 
-		public Task<IStorageHistory> RestoreFromTrashAsync(IStorageItem source, string destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> RestoreFromTrashAsync(IStorageItem source, string destination, IProgress<StatusCenterItemProgressModel>? progress, CancellationToken cancellationToken)
 		{
-			return RestoreFromTrashAsync(source.FromStorageItem(), destination, progress, cancellationToken);
+			return RestoreFromTrashAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for restoration."), destination, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath source, string destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> RestoreFromTrashAsync(IStorageItemWithPath source, string destination, IProgress<StatusCenterItemProgressModel>? progress, CancellationToken cancellationToken)
 		{
 			StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress);
 			fsProgress.Report();
@@ -738,35 +809,53 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so
 			{
 				if (source.ItemType == FilesystemItemType.Directory)
 				{
-					FilesystemResult<BaseStorageFolder> sourceFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken);
-					FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
+					FilesystemResult<BaseStorageFolder> sourceFolder = await ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken);
+					FilesystemResult<BaseStorageFolder> destinationFolder = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 
 					fsResult = sourceFolder.ErrorCode | destinationFolder.ErrorCode;
 					fsProgress.ReportStatus(fsResult);
 
-					if (fsResult)
+					if (fsResult &&
+						sourceFolder.Result is { } sourceFolderItem &&
+						destinationFolder.Result is { } destinationFolderItem)
 					{
 						// Moving folders using Storage API can result in data loss, copy instead
 						//fsResult = await FilesystemTasks.Wrap(() => MoveDirectoryAsync(sourceFolder.Result, destinationFolder.Result, Path.GetFileName(destination), CreationCollisionOption.FailIfExists, true));
 
+						var destinationName = Path.GetFileName(destination)!;
 						if (await DialogDisplayHelper.ShowDialogAsync(Strings.ErrorDialogThisActionCannotBeDone.GetLocalizedResource(), Strings.ErrorDialogUnsupportedMoveOperation.GetLocalizedResource(), "OK", Strings.Cancel.GetLocalizedResource()))
-							fsResult = await FilesystemTasks.Wrap(() => CloneDirectoryAsync(sourceFolder.Result, destinationFolder.Result, Path.GetFileName(destination), CreationCollisionOption.FailIfExists));
+						{
+							fsResult = await FilesystemTasks.Wrap(() => CloneDirectoryAsync(sourceFolderItem, destinationFolderItem, destinationName, CreationCollisionOption.FailIfExists));
+						}
 
 						// TODO: we could use here FilesystemHelpers with registerHistory false?
 					}
+					else if (fsResult)
+					{
+						fsResult = FileSystemStatusCode.Generic;
+					}
 
 					fsProgress.ReportStatus(fsResult);
 				}
 				else
 				{
-					FilesystemResult<BaseStorageFile> sourceFile = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken);
-					FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
+					FilesystemResult<BaseStorageFile> sourceFile = await ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken);
+					FilesystemResult<BaseStorageFolder> destinationFolder = await ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 
 					fsResult = sourceFile.ErrorCode | destinationFolder.ErrorCode;
 					fsProgress.ReportStatus(fsResult);
 
-					if (fsResult)
-						fsResult = await FilesystemTasks.Wrap(() => sourceFile.Result.MoveAsync(destinationFolder.Result, Path.GetFileName(destination), NameCollisionOption.GenerateUniqueName).AsTask());
+					var destinationName = Path.GetFileName(destination)!;
+					if (fsResult &&
+						sourceFile.Result is { } sourceFileItem &&
+						destinationFolder.Result is { } destinationFolderItem)
+					{
+						fsResult = await FilesystemTasks.Wrap(() => sourceFileItem.MoveAsync(destinationFolderItem, destinationName, NameCollisionOption.GenerateUniqueName).AsTask());
+					}
+					else if (fsResult)
+					{
+						fsResult = FileSystemStatusCode.Generic;
+					}
 
 					fsProgress.ReportStatus(fsResult);
 				}
@@ -780,10 +869,13 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so
 			if (fsResult)
 			{
 				// Recycle bin also stores a file starting with $I for each item
-				string iFilePath = Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileName(source.Path).Replace("$R", "$I", StringComparison.Ordinal));
-
-				await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)
-					.OnSuccess(iFile => iFile.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());
+				var parentPath = Path.GetDirectoryName(source.Path)
+					?? throw new InvalidOperationException("The recycle-bin item does not have a parent path.");
+				var fileName = Path.GetFileName(source.Path)!;
+				string iFilePath = Path.Combine(parentPath, fileName.Replace("$R", "$I", StringComparison.Ordinal));
+				await ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)
+					.OnSuccess(iFile => (iFile ?? throw new InvalidOperationException($"The recycle-bin metadata file '{iFilePath}' could not be opened."))
+						.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());
 			}
 
 			fsProgress.ReportStatus(fsResult);
@@ -831,17 +923,18 @@ private async static Task<BaseStorageFolder> CloneDirectoryAsync(BaseStorageFold
 			return createdRoot;
 		}
 
-		public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> CopyItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return await CopyItemsAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), destination, collisions, progress, cancellationToken);
+			return await CopyItemsAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for copying.")).ToListAsync(), destination, collisions, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken token, bool asAdmin = false)
+		public async Task<IStorageHistory?> CopyItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken token, bool asAdmin = false)
 		{
 			StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress, source.Count);
 			fsProgress.Report();
 
-			var rawStorageHistory = new List<IStorageHistory>();
+			var rawStorageHistory = new List<IStorageHistory?>();
 
 			for (int i = 0; i < source.Count; i++)
 			{
@@ -865,27 +958,29 @@ public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> so
 
 			}
 
-			if (rawStorageHistory.Any() && rawStorageHistory.All((item) => item is not null))
+			if (rawStorageHistory.Count > 0 && rawStorageHistory.All(item => item is not null))
 			{
+				var storageHistory = rawStorageHistory.WhereNotNull().ToList();
 				return new StorageHistory(
-					rawStorageHistory[0].OperationType,
-					await rawStorageHistory.SelectMany((item) => item.Source).ToListAsync(),
-					await rawStorageHistory.SelectMany((item) => item.Destination).ToListAsync());
+					storageHistory[0].OperationType,
+					await storageHistory.SelectMany(item => item.Source).ToListAsync(),
+					await storageHistory.SelectMany(item => item.Destination!).ToListAsync());
 			}
 			return null;
 		}
 
-		public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> MoveItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return await MoveItemsAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), destination, collisions, progress, cancellationToken);
+			return await MoveItemsAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for moving.")).ToListAsync(), destination, collisions, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken token, bool asAdmin = false)
+		public async Task<IStorageHistory?> MoveItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken token, bool asAdmin = false)
 		{
 			StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress, source.Count);
 			fsProgress.Report();
 
-			var rawStorageHistory = new List<IStorageHistory>();
+			var rawStorageHistory = new List<IStorageHistory?>();
 
 			for (int i = 0; i < source.Count; i++)
 			{
@@ -908,28 +1003,30 @@ public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> so
 				fsProgress.Report();
 			}
 
-			if (rawStorageHistory.Any() && rawStorageHistory.All((item) => item is not null))
+			if (rawStorageHistory.Count > 0 && rawStorageHistory.All(item => item is not null))
 			{
+				var storageHistory = rawStorageHistory.WhereNotNull().ToList();
 				return new StorageHistory(
-					rawStorageHistory[0].OperationType,
-					await rawStorageHistory.SelectMany((item) => item.Source).ToListAsync(),
-					await rawStorageHistory.SelectMany((item) => item.Destination).ToListAsync());
+					storageHistory[0].OperationType,
+					await storageHistory.SelectMany(item => item.Source).ToListAsync(),
+					await storageHistory.SelectMany(item => item.Destination!).ToListAsync());
 			}
 			return null;
 		}
 
-		public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItem> source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> DeleteItemsAsync(IList<IStorageItem> source, IProgress<StatusCenterItemProgressModel>? progress, bool permanently, CancellationToken cancellationToken)
 		{
-			return await DeleteItemsAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), progress, permanently, cancellationToken);
+			return await DeleteItemsAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for deletion.")).ToListAsync(), progress, permanently, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath> source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken token, bool asAdmin = false)
+		public async Task<IStorageHistory?> DeleteItemsAsync(IList<IStorageItemWithPath> source, IProgress<StatusCenterItemProgressModel>? progress, bool permanently, CancellationToken token, bool asAdmin = false)
 		{
 			StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress, source.Count);
 			fsProgress.Report();
 
 			bool originalPermanently = permanently;
-			var rawStorageHistory = new List<IStorageHistory>();
+			var rawStorageHistory = new List<IStorageHistory?>();
 
 			for (int i = 0; i < source.Count; i++)
 			{
@@ -943,12 +1040,27 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 				fsProgress.Report();
 			}
 
-			if (rawStorageHistory.Any() && rawStorageHistory.All((item) => item is not null))
+			if (rawStorageHistory.Count > 0 && rawStorageHistory.All(item => item is not null))
 			{
+				var storageHistory = rawStorageHistory.WhereNotNull().ToList();
+				var recycleHistory = storageHistory.Where(item => item.OperationType is FileOperationType.Recycle).ToList();
+				if (recycleHistory.Count > 0)
+				{
+					if (recycleHistory.Any(item => item.Destination is null))
+						return null;
+
+					var sources = await recycleHistory.SelectMany(item => item.Source).ToListAsync();
+					var destinations = await recycleHistory.SelectMany(item => item.Destination!).ToListAsync();
+
+					return sources.Count == destinations.Count
+						? new StorageHistory(FileOperationType.Recycle, sources, destinations)
+						: null;
+				}
+
 				return new StorageHistory(
-					rawStorageHistory[0].OperationType,
-					await rawStorageHistory.SelectMany((item) => item.Source).ToListAsync(),
-					await rawStorageHistory.SelectMany((item) => item.Destination).ToListAsync());
+					FileOperationType.Delete,
+					await storageHistory.SelectMany(item => item.Source).ToListAsync(),
+					null);
 			}
 			return null;
 		}
diff --git a/src/Files.App/Utils/Storage/Operations/IFilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/IFilesystemOperations.cs
index add069d2ab7d..d5b5bc3b2822 100644
--- a/src/Files.App/Utils/Storage/Operations/IFilesystemOperations.cs
+++ b/src/Files.App/Utils/Storage/Operations/IFilesystemOperations.cs
@@ -25,7 +25,7 @@ public interface IFilesystemOperations : IDisposable
 		/// <br/>
 		/// Destination: null
 		/// </returns>
-		Task<(IStorageHistory, IStorageItem)> CreateAsync(
+		Task<(IStorageHistory?, IStorageItem?)> CreateAsync(
 			IStorageItemWithPath source,
 			IProgress<StatusCenterItemProgressModel> process,
 			CancellationToken cancellationToken,
@@ -51,7 +51,7 @@ Task<IStorageHistory> CreateShortcutItemsAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> was copied
 		/// </returns>
-		Task<IStorageHistory> CopyAsync(
+		Task<IStorageHistory?> CopyAsync(
 			IStorageItem source,
 			string destination,
 			NameCollisionOption collision,
@@ -72,7 +72,7 @@ Task<IStorageHistory> CopyAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> was copied
 		/// </returns>
-		Task<IStorageHistory> CopyAsync(
+		Task<IStorageHistory?> CopyAsync(
 			IStorageItemWithPath source,
 			string destination,
 			NameCollisionOption collision,
@@ -82,7 +82,7 @@ Task<IStorageHistory> CopyAsync(
 		/// <summary>
 		/// Copies <paramref name="source"/> to <paramref name="destination"/> fullPath
 		/// </summary>
-		Task<IStorageHistory> CopyItemsAsync(
+		Task<IStorageHistory?> CopyItemsAsync(
 			IList<IStorageItem> source,
 			IList<string> destination,
 			IList<FileNameConflictResolveOptionType> collisions,
@@ -92,7 +92,7 @@ Task<IStorageHistory> CopyItemsAsync(
 		/// <summary>
 		/// Copies <paramref name="source"/> to <paramref name="destination"/> fullPath
 		/// </summary>
-		Task<IStorageHistory> CopyItemsAsync(
+		Task<IStorageHistory?> CopyItemsAsync(
 			IList<IStorageItemWithPath> source,
 			IList<string> destination,
 			IList<FileNameConflictResolveOptionType> collisions,
@@ -114,7 +114,7 @@ Task<IStorageHistory> CopyItemsAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> was moved
 		/// </returns>
-		Task<IStorageHistory> MoveAsync(
+		Task<IStorageHistory?> MoveAsync(
 			IStorageItem source,
 			string destination,
 			NameCollisionOption collision,
@@ -135,7 +135,7 @@ Task<IStorageHistory> MoveAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> was moved
 		/// </returns>
-		Task<IStorageHistory> MoveAsync(
+		Task<IStorageHistory?> MoveAsync(
 			IStorageItemWithPath source,
 			string destination,
 			NameCollisionOption collision,
@@ -145,7 +145,7 @@ Task<IStorageHistory> MoveAsync(
 		/// <summary>
 		/// Moves <paramref name="source"/> to <paramref name="destination"/> fullPath
 		/// </summary>
-		Task<IStorageHistory> MoveItemsAsync(
+		Task<IStorageHistory?> MoveItemsAsync(
 			IList<IStorageItem> source,
 			IList<string> destination,
 			IList<FileNameConflictResolveOptionType> collisions,
@@ -155,7 +155,7 @@ Task<IStorageHistory> MoveItemsAsync(
 		/// <summary>
 		/// Moves <paramref name="source"/> to <paramref name="destination"/> fullPath
 		/// </summary>
-		Task<IStorageHistory> MoveItemsAsync(
+		Task<IStorageHistory?> MoveItemsAsync(
 			IList<IStorageItemWithPath> source,
 			IList<string> destination,
 			IList<FileNameConflictResolveOptionType> collisions,
@@ -180,7 +180,7 @@ Task<IStorageHistory> MoveItemsAsync(
 		/// <br/>
 		/// If <paramref name="permanently"/> was false, returns path to recycled item
 		/// </returns>
-		Task<IStorageHistory> DeleteAsync(
+		Task<IStorageHistory?> DeleteAsync(
 			IStorageItem source,
 			IProgress<StatusCenterItemProgressModel> progress,
 			bool permanently,
@@ -203,7 +203,7 @@ Task<IStorageHistory> DeleteAsync(
 		/// <br/>
 		/// If <paramref name="permanently"/> was false, returns path to recycled item
 		/// </returns>
-		Task<IStorageHistory> DeleteAsync(
+		Task<IStorageHistory?> DeleteAsync(
 			IStorageItemWithPath source,
 			IProgress<StatusCenterItemProgressModel> progress,
 			bool permanently,
@@ -212,7 +212,7 @@ Task<IStorageHistory> DeleteAsync(
 		/// <summary>
 		/// Deletes provided <paramref name="source"/>
 		/// </summary>
-		Task<IStorageHistory> DeleteItemsAsync(
+		Task<IStorageHistory?> DeleteItemsAsync(
 			IList<IStorageItem> source,
 			IProgress<StatusCenterItemProgressModel> progress,
 			bool permanently,
@@ -221,7 +221,7 @@ Task<IStorageHistory> DeleteItemsAsync(
 		/// <summary>
 		/// Deletes provided <paramref name="source"/>
 		/// </summary>
-		Task<IStorageHistory> DeleteItemsAsync(
+		Task<IStorageHistory?> DeleteItemsAsync(
 			IList<IStorageItemWithPath> source,
 			IProgress<StatusCenterItemProgressModel> progress,
 			bool permanently,
@@ -241,7 +241,7 @@ Task<IStorageHistory> DeleteItemsAsync(
 		/// <br/>
 		/// Destination: The renamed item fullPath (as <see cref="PathWithType"/>)
 		/// </returns>
-		Task<IStorageHistory> RenameAsync(
+		Task<IStorageHistory?> RenameAsync(
 			IStorageItem source,
 			string newName,
 			NameCollisionOption collision,
@@ -261,7 +261,7 @@ Task<IStorageHistory> RenameAsync(
 		/// <br/>
 		/// Destination: The renamed item fullPath (as <see cref="PathWithType"/>)
 		/// </returns>
-		Task<IStorageHistory> RenameAsync(
+		Task<IStorageHistory?> RenameAsync(
 			IStorageItemWithPath source,
 			string newName,
 			NameCollisionOption collision,
@@ -282,7 +282,7 @@ Task<IStorageHistory> RenameAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> has been restored
 		/// </returns>
-		Task<IStorageHistory> RestoreItemsFromTrashAsync(
+		Task<IStorageHistory?> RestoreItemsFromTrashAsync(
 			IList<IStorageItem> source,
 			IList<string> destination,
 			IProgress<StatusCenterItemProgressModel> progress,
@@ -301,7 +301,7 @@ Task<IStorageHistory> RestoreItemsFromTrashAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> has been restored
 		/// </returns>
-		Task<IStorageHistory> RestoreFromTrashAsync(
+		Task<IStorageHistory?> RestoreFromTrashAsync(
 			IStorageItem source,
 			string destination,
 			IProgress<StatusCenterItemProgressModel> progress,
@@ -320,7 +320,7 @@ Task<IStorageHistory> RestoreFromTrashAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> has been restored
 		/// </returns>
-		Task<IStorageHistory> RestoreItemsFromTrashAsync(
+		Task<IStorageHistory?> RestoreItemsFromTrashAsync(
 			IList<IStorageItemWithPath> source,
 			IList<string> destination,
 			IProgress<StatusCenterItemProgressModel> progress,
@@ -340,7 +340,7 @@ Task<IStorageHistory> RestoreItemsFromTrashAsync(
 		/// <br/>
 		/// Destination: The <paramref name="destination"/> item fullPath (as <see cref="PathWithType"/>) the <paramref name="source"/> has been restored
 		/// </returns>
-		Task<IStorageHistory> RestoreFromTrashAsync(
+		Task<IStorageHistory?> RestoreFromTrashAsync(
 			IStorageItemWithPath source,
 			string destination,
 			IProgress<StatusCenterItemProgressModel> progress,
diff --git a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs
index 8c9e60ff49d4..f4fc5e4462e7 100644
--- a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs
+++ b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs
@@ -13,9 +13,12 @@ public sealed partial class ShellFilesystemOperations : IFilesystemOperations
 	{
 		private readonly IStorageTrashBinService StorageTrashBinService = Ioc.Default.GetRequiredService<IStorageTrashBinService>();
 
-		private IShellPage _associatedInstance;
+		private readonly IShellPage _associatedInstance;
 
-		private FilesystemOperations _filesystemOperations;
+		private readonly FilesystemOperations _filesystemOperations;
+
+		private ShellViewModel ShellViewModel =>
+			_associatedInstance.GetRequiredShellViewModel();
 
 		public ShellFilesystemOperations(IShellPage associatedInstance)
 		{
@@ -23,22 +26,24 @@ public ShellFilesystemOperations(IShellPage associatedInstance)
 			_filesystemOperations = new FilesystemOperations(associatedInstance);
 		}
 
-		public Task<IStorageHistory> CopyAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> CopyAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return CopyAsync(source.FromStorageItem(), destination, collision, progress, cancellationToken);
+			return CopyAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for copying."), destination, collision, progress, cancellationToken);
 		}
 
-		public Task<IStorageHistory> CopyAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> CopyAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
 			return CopyItemsAsync(source.CreateList(), destination.CreateList(), collision.ConvertBack().CreateList(), progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> CopyItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return await CopyItemsAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), destination, collisions, progress, cancellationToken);
+			return await CopyItemsAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for copying.")).ToListAsync(), destination, collisions, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
+		public async Task<IStorageHistory?> CopyItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
 		{
 			if (source.Any(x => string.IsNullOrWhiteSpace(x.Path) || x.Path.StartsWith(@"\\?\", StringComparison.Ordinal) || FtpHelpers.IsFtpPath(x.Path) || ZipStorageFolder.IsZipPath(x.Path, false))
 				|| destination.Any(x => string.IsNullOrWhiteSpace(x) || x.StartsWith(@"\\?\", StringComparison.Ordinal) || FtpHelpers.IsFtpPath(x) || ZipStorageFolder.IsZipPath(x, false)))
@@ -94,11 +99,11 @@ public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> so
 			if (result)
 			{
 				fsProgress.ReportStatus(FileSystemStatusCode.Success);
-				var copiedSources = copyResult.Items.Where(x => x.Succeeded && x.Destination is not null && x.Source != x.Destination);
+				var copiedSources = GetSuccessfulResults(copyResult.Items);
 				if (copiedSources.Any())
 				{
 					var sourceMatch = await copiedSources.Select(x => sourceRename
-						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return new StorageHistory(
 						FileOperationType.Copy,
@@ -120,14 +125,14 @@ public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> so
 				else if (copyResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse))
 				{
 					var failedSources = copyResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse);
-					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source);
+					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source).WhereNotNull();
 					var lockingProcess = WhoIsLocking(filePath);
 
 					switch (await GetFileInUseDialog(filePath, lockingProcess))
 					{
 						case DialogResult.Primary:
 							var copyZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-							var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+							var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 							return await CopyItemsAsync(
 								await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -140,7 +145,7 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 					// Retry with the StorageFile API
 					var failedSources = copyResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NameTooLong);
 					var copyZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-					var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+					var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return await _filesystemOperations.CopyItemsAsync(
 						await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -158,13 +163,13 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 				else if (copyResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss))
 				{
 					var failedSources = copyResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss);
-					var filePath = failedSources.Select(x => x.Source);
+					var filePath = failedSources.Select(x => x.Source).WhereNotNull();
 
 					switch (await GetFileListDialog(filePath, Strings.FilePropertiesCannotBeCopied.GetLocalizedResource(), Strings.CopyFileWithoutProperties.GetLocalizedResource(), Strings.OK.GetLocalizedResource(), Strings.Cancel.GetLocalizedResource()))
 					{
 						case DialogResult.Primary:
 							var copyZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-							var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+							var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 							return await CopyItemsAsync(
 								await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -178,7 +183,8 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 				{
 					var failingItems = copyResult.Items
 						.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.FileTooLarge)
-						.Select(item => item.Source);
+						.Select(item => item.Source)
+						.WhereNotNull();
 
 					await Ioc.Default.GetRequiredService<IDialogService>().ShowDialogAsync(new FileTooLargeDialogViewModel(failingItems));
 				}
@@ -188,7 +194,7 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 					// Retry with the StorageFile API
 					var failedSources = copyResult.Items.Where(x => !x.Succeeded);
 					var copyZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-					var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+					var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return await _filesystemOperations.CopyItemsAsync(
 						await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -202,7 +208,7 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 			}
 		}
 
-		public async Task<(IStorageHistory, IStorageItem)> CreateAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
+		public async Task<(IStorageHistory?, IStorageItem?)> CreateAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
 		{
 			if (string.IsNullOrWhiteSpace(source.Path) || source.Path.StartsWith(@"\\?\", StringComparison.Ordinal) || FtpHelpers.IsFtpPath(source.Path) || ZipStorageFolder.IsZipPath(source.Path, false))
 			{
@@ -259,10 +265,12 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 			{
 				fsProgress.ReportStatus(FileSystemStatusCode.Success);
 
-				var createdSources = createResult.Items.Where(x => x.Succeeded && x.Destination is not null && x.Source != x.Destination);
-				if (createdSources.Any())
+				var createdDestination = createResult.Items
+					.SingleOrDefault(x => x is { Succeeded: true, Destination: not null } && x.Source != x.Destination)
+					?.Destination;
+				if (createdDestination is not null)
 				{
-					var item = StorageHelpers.FromPathAndType(createdSources.Single().Destination, source.ItemType);
+					var item = StorageHelpers.FromPathAndType(createdDestination, source.ItemType);
 					var storageItem = await item.ToStorageItem();
 
 					return (new StorageHistory(FileOperationType.CreateNew, item.CreateList(), null), storageItem);
@@ -328,22 +336,24 @@ public async Task<IStorageHistory> CreateShortcutItemsAsync(IList<IStorageItemWi
 			return new StorageHistory(FileOperationType.CreateLink, createdSources, createdDestination);
 		}
 
-		public Task<IStorageHistory> DeleteAsync(IStorageItem source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> DeleteAsync(IStorageItem source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
 		{
-			return DeleteAsync(source.FromStorageItem(), progress, permanently, cancellationToken);
+			return DeleteAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for deletion."), progress, permanently, cancellationToken);
 		}
 
-		public Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> DeleteAsync(IStorageItemWithPath source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
 		{
 			return DeleteItemsAsync(source.CreateList(), progress, permanently, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItem> source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> DeleteItemsAsync(IList<IStorageItem> source, IProgress<StatusCenterItemProgressModel>? progress, bool permanently, CancellationToken cancellationToken)
 		{
-			return await DeleteItemsAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), progress, permanently, cancellationToken);
+			return await DeleteItemsAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for deletion.")).ToListAsync(), progress, permanently, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath> source, IProgress<StatusCenterItemProgressModel> progress, bool permanently, CancellationToken cancellationToken, bool asAdmin = false)
+		public async Task<IStorageHistory?> DeleteItemsAsync(IList<IStorageItemWithPath> source, IProgress<StatusCenterItemProgressModel>? progress, bool permanently, CancellationToken cancellationToken, bool asAdmin = false)
 		{
 			if (source.Any(x => string.IsNullOrWhiteSpace(x.Path) || x.Path.StartsWith(@"\\?\", StringComparison.Ordinal) || FtpHelpers.IsFtpPath(x.Path)))
 			{
@@ -367,7 +377,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 			if (deleteFromRecycleBin)
 			{
 				// Recycle bin also stores a file starting with $I for each item
-				deleteFilePaths = deleteFilePaths.Concat(source.Select(x => Path.Combine(Path.GetDirectoryName(x.Path), Path.GetFileName(x.Path).Replace("$R", "$I", StringComparison.Ordinal)))).Distinct();
+				deleteFilePaths = deleteFilePaths.Concat(source.Select(x => GetRecycleMetadataPath(x.Path)).WhereNotNull()).Distinct();
 			}
 
 			var operationID = Guid.NewGuid().ToString();
@@ -387,14 +397,15 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 
 				foreach (var item in deleteResult.Items)
 				{
-					await _associatedInstance.ShellViewModel.RemoveFileOrFolderAsync(item.Source);
+					if (item.Source is { } itemPath)
+						await ShellViewModel.RemoveFileOrFolderAsync(itemPath);
 				}
 
-				var recycledSources = deleteResult.Items.Where(x => x.Succeeded && x.Destination is not null && x.Source != x.Destination);
+				var recycledSources = GetSuccessfulResults(deleteResult.Items);
 				if (recycledSources.Any())
 				{
 					var sourceMatch = await recycledSources.Select(x => source.DistinctBy(x => x.Path)
-						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return new StorageHistory(
 						FileOperationType.Recycle,
@@ -419,28 +430,31 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 					var filesToCheck = new List<string>();
 					foreach (var failedSource in failedSources)
 					{
-						if (Directory.Exists(failedSource.Source))
+						if (failedSource.Source is not { } failedPath)
+							continue;
+
+						if (Directory.Exists(failedPath))
 						{
 							try
 							{
-								var files = Directory.EnumerateFiles(failedSource.Source, "*", SearchOption.AllDirectories);
+								var files = Directory.EnumerateFiles(failedPath, "*", SearchOption.AllDirectories);
 								filesToCheck.AddRange(files);
 							}
 							catch { }
 						}
-						else if (File.Exists(failedSource.Source))
+						else if (File.Exists(failedPath))
 						{
-							filesToCheck.Add(failedSource.Source);
+							filesToCheck.Add(failedPath);
 						}
 					}
 
-					var filePath = filesToCheck.Any() ? filesToCheck : failedSources.Select(x => x.Source);
+					var filePath = filesToCheck.Any() ? filesToCheck : failedSources.Select(x => x.Source).WhereNotNull();
 					var lockingProcess = WhoIsLocking(filePath);
 
 					switch (await GetFileInUseDialog(filePath, lockingProcess))
 					{
 						case DialogResult.Primary:
-							return await DeleteItemsAsync(await failedSources.Select(x => source.DistinctBy(x => x.Path).SingleOrDefault(s => s.Path == x.Source)).Where(x => x is not null).ToListAsync(), progress, permanently, cancellationToken);
+							return await DeleteItemsAsync(await failedSources.Select(x => source.DistinctBy(x => x.Path).SingleOrDefault(s => s.Path == x.Source)).WhereNotNull().ToListAsync(), progress, permanently, cancellationToken);
 					}
 				}
 				else if (deleteResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NameTooLong))
@@ -455,7 +469,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 				{
 					// Retry with StorageFile API
 					var failedSources = deleteResult.Items.Where(x => !x.Succeeded);
-					var sourceMatch = await failedSources.Select(x => source.DistinctBy(x => x.Path).SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+					var sourceMatch = await failedSources.Select(x => source.DistinctBy(x => x.Path).SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return await _filesystemOperations.DeleteItemsAsync(sourceMatch, progress, permanently, cancellationToken);
 				}
@@ -466,22 +480,24 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 			}
 		}
 
-		public Task<IStorageHistory> MoveAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> MoveAsync(IStorageItem source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return MoveAsync(source.FromStorageItem(), destination, collision, progress, cancellationToken);
+			return MoveAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for moving."), destination, collision, progress, cancellationToken);
 		}
 
-		public Task<IStorageHistory> MoveAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> MoveAsync(IStorageItemWithPath source, string destination, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
 			return MoveItemsAsync(source.CreateList(), destination.CreateList(), collision.ConvertBack().CreateList(), progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> MoveItemsAsync(IList<IStorageItem> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return await MoveItemsAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), destination, collisions, progress, cancellationToken);
+			return await MoveItemsAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for moving.")).ToListAsync(), destination, collisions, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
+		public async Task<IStorageHistory?> MoveItemsAsync(IList<IStorageItemWithPath> source, IList<string> destination, IList<FileNameConflictResolveOptionType> collisions, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
 		{
 			if (source.Any(x => string.IsNullOrWhiteSpace(x.Path) || x.Path.StartsWith(@"\\?\", StringComparison.Ordinal)) || destination.Any(x => string.IsNullOrWhiteSpace(x) || x.StartsWith(@"\\?\", StringComparison.Ordinal) || FtpHelpers.IsFtpPath(x) || ZipStorageFolder.IsZipPath(x, false)))
 			{
@@ -533,11 +549,11 @@ public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> so
 			{
 				fsProgress.ReportStatus(FileSystemStatusCode.Success);
 
-				var movedSources = moveResult.Items.Where(x => x.Succeeded && x.Destination is not null && x.Source != x.Destination);
+				var movedSources = GetSuccessfulResults(moveResult.Items);
 				if (movedSources.Any())
 				{
 					var sourceMatch = await movedSources.Select(x => sourceRename
-						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return new StorageHistory(FileOperationType.Move,
 						sourceMatch,
@@ -566,14 +582,14 @@ public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> so
 				else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse))
 				{
 					var failedSources = moveResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse);
-					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source);
+					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source).WhereNotNull();
 					var lockingProcess = WhoIsLocking(filePath);
 
 					switch (await GetFileInUseDialog(filePath, lockingProcess))
 					{
 						case DialogResult.Primary:
 							var moveZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-							var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+							var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 							return await MoveItemsAsync(
 								await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -586,7 +602,7 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 					// Retry with the StorageFile API
 					var failedSources = moveResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NameTooLong);
 					var moveZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-					var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+					var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return await _filesystemOperations.MoveItemsAsync(
 						await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -604,12 +620,12 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 				else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss))
 				{
 					var failedSources = moveResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.PropertyLoss);
-					var filePath = failedSources.Select(x => x.Source);
+					var filePath = failedSources.Select(x => x.Source).WhereNotNull();
 					switch (await GetFileListDialog(filePath, Strings.FilePropertiesCannotBeMoved.GetLocalizedResource(), Strings.MoveFileWithoutProperties.GetLocalizedResource(), Strings.OK.GetLocalizedResource(), Strings.Cancel.GetLocalizedResource()))
 					{
 						case DialogResult.Primary:
 							var copyZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-							var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+							var sourceMatch = await failedSources.Select(x => copyZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 							return await CopyItemsAsync(
 								await sourceMatch.Select(x => x.src).ToListAsync(),
 								await sourceMatch.Select(x => x.dest).ToListAsync(),
@@ -623,7 +639,7 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 					// Retry with the StorageFile API
 					var failedSources = moveResult.Items.Where(x => !x.Succeeded);
 					var moveZip = sourceNoSkip.Zip(destinationNoSkip, (src, dest) => new { src, dest }).Zip(collisionsNoSkip, (z1, coll) => new { z1.src, z1.dest, coll });
-					var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+					var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return await _filesystemOperations.MoveItemsAsync(
 						await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -635,12 +651,13 @@ await sourceMatch.Select(x => x.dest).ToListAsync(),
 			}
 		}
 
-		public Task<IStorageHistory> RenameAsync(IStorageItem source, string newName, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> RenameAsync(IStorageItem source, string newName, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return RenameAsync(StorageHelpers.FromStorageItem(source), newName, collision, progress, cancellationToken);
+			return RenameAsync(StorageHelpers.FromStorageItem(source)
+				?? throw new InvalidOperationException("The storage item could not be converted for renaming."), newName, collision, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> RenameAsync(IStorageItemWithPath source, string newName, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
+		public async Task<IStorageHistory?> RenameAsync(IStorageItemWithPath source, string newName, NameCollisionOption collision, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
 		{
 			if (string.IsNullOrWhiteSpace(source.Path) || source.Path.StartsWith(@"\\?\", StringComparison.Ordinal) || FtpHelpers.IsFtpPath(source.Path) || ZipStorageFolder.IsZipPath(source.Path, false))
 			{
@@ -663,12 +680,15 @@ public async Task<IStorageHistory> RenameAsync(IStorageItemWithPath source, stri
 			{
 				fsProgress.ReportStatus(FileSystemStatusCode.Success);
 
-				var renamedSources = renameResult.Items.Where(x => x.Succeeded && x.Destination is not null && x.Source != x.Destination)
-					.Where(x => x.Source == source.Path);
-				if (renamedSources.Any())
+				var renamedDestination = renameResult.Items
+					.SingleOrDefault(x => x is { Succeeded: true, Destination: not null } &&
+						x.Source == source.Path &&
+						x.Source != x.Destination)
+					?.Destination;
+				if (renamedDestination is not null)
 				{
 					return new StorageHistory(FileOperationType.Rename, source,
-						StorageHelpers.FromPathAndType(renamedSources.Single().Destination, source.ItemType));
+						StorageHelpers.FromPathAndType(renamedDestination, source.ItemType));
 				}
 
 				// Cannot undo overwrite operation
@@ -694,7 +714,7 @@ await DynamicDialogFactory
 				else if (renameResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse))
 				{
 					var failedSources = renameResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse);
-					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source);
+					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source).WhereNotNull();
 					var lockingProcess = WhoIsLocking(filePath);
 
 					switch (await GetFileInUseDialog(filePath, lockingProcess))
@@ -729,22 +749,24 @@ await DynamicDialogFactory
 			}
 		}
 
-		public Task<IStorageHistory> RestoreFromTrashAsync(IStorageItem source, string destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> RestoreFromTrashAsync(IStorageItem source, string destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return RestoreFromTrashAsync(source.FromStorageItem(), destination, progress, cancellationToken);
+			return RestoreFromTrashAsync(source.FromStorageItem()
+				?? throw new InvalidOperationException("The storage item could not be converted for restoration."), destination, progress, cancellationToken);
 		}
 
-		public Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath source, string destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public Task<IStorageHistory?> RestoreFromTrashAsync(IStorageItemWithPath source, string destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
 			return RestoreItemsFromTrashAsync(source.CreateList(), destination.CreateList(), progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItem> source, IList<string> destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public async Task<IStorageHistory?> RestoreItemsFromTrashAsync(IList<IStorageItem> source, IList<string> destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
-			return await RestoreItemsFromTrashAsync(await source.Select((item) => item.FromStorageItem()).ToListAsync(), destination, progress, cancellationToken);
+			return await RestoreItemsFromTrashAsync(await source.Select(item => item.FromStorageItem()
+				?? throw new InvalidOperationException("A storage item could not be converted for restoration.")).ToListAsync(), destination, progress, cancellationToken);
 		}
 
-		public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItemWithPath> source, IList<string> destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
+		public async Task<IStorageHistory?> RestoreItemsFromTrashAsync(IList<IStorageItemWithPath> source, IList<string> destination, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken, bool asAdmin = false)
 		{
 			if (source.Any(x => string.IsNullOrWhiteSpace(x.Path) || x.Path.StartsWith(@"\\?\", StringComparison.Ordinal)) || destination.Any(x => string.IsNullOrWhiteSpace(x) || x.StartsWith(@"\\?\", StringComparison.Ordinal) || FtpHelpers.IsFtpPath(x) || ZipStorageFolder.IsZipPath(x, false)))
 			{
@@ -769,16 +791,16 @@ public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItem
 			{
 				fsProgress.ReportStatus(FileSystemStatusCode.Success);
 
-				var movedSources = moveResult.Items.Where(x => x.Succeeded && x.Destination is not null && x.Source != x.Destination);
+				var movedSources = GetSuccessfulResults(moveResult.Items);
 				if (movedSources.Any())
 				{
 					var sourceMatch = await movedSources.Select(x => source
-						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					// Recycle bin also stores a file starting with $I for each item
 					await DeleteItemsAsync(await movedSources.Zip(sourceMatch, (rSrc, oSrc) => new { rSrc, oSrc })
 						.Select(src => StorageHelpers.FromPathAndType(
-							Path.Combine(Path.GetDirectoryName(src.rSrc.Source), Path.GetFileName(src.rSrc.Source).Replace("$R", "$I", StringComparison.Ordinal)),
+							GetRecycleMetadataPath(src.rSrc.Source) ?? throw new InvalidOperationException("The recycle bin metadata path is invalid."),
 							src.oSrc.ItemType)).ToListAsync(), null, true, cancellationToken);
 
 					return new StorageHistory(FileOperationType.Restore,
@@ -799,14 +821,14 @@ public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItem
 				else if (moveResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse))
 				{
 					var failedSources = moveResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.InUse);
-					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source);
+					var filePath = failedSources.Select(x => x.HResult == CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_DEST ? x.Destination : x.Source).WhereNotNull();
 					var lockingProcess = WhoIsLocking(filePath);
 
 					switch (await GetFileInUseDialog(filePath, lockingProcess))
 					{
 						case DialogResult.Primary:
 							var moveZip = source.Zip(destination, (src, dest) => new { src, dest });
-							var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+							var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 							return await RestoreItemsFromTrashAsync(
 								await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -818,7 +840,7 @@ await sourceMatch.Select(x => x.src).ToListAsync(),
 					// Retry with StorageFile API
 					var failedSources = moveResult.Items.Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.NameTooLong);
 					var moveZip = source.Zip(destination, (src, dest) => new { src, dest });
-					var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+					var sourceMatch = await failedSources.Select(x => moveZip.SingleOrDefault(s => s.src.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).WhereNotNull().ToListAsync();
 
 					return await _filesystemOperations.RestoreItemsFromTrashAsync(
 						await sourceMatch.Select(x => x.src).ToListAsync(),
@@ -839,9 +861,10 @@ await sourceMatch.Select(x => x.src).ToListAsync(),
 			}
 		}
 
-		private void CancelOperation(object operationID)
+		private void CancelOperation(object? operationID)
 		{
-			FileOperationsHelpers.TryCancelOperation((string)operationID);
+			if (operationID is string id)
+				FileOperationsHelpers.TryCancelOperation(id);
 		}
 
 		private async Task<bool> RequestAdminOperation()
@@ -850,7 +873,7 @@ private async Task<bool> RequestAdminOperation()
 			return await dialogService.ShowDialogAsync(new ElevateConfirmDialogViewModel()) == DialogResult.Primary;
 		}
 
-		private Task<DialogResult> GetFileInUseDialog(IEnumerable<string> source, IEnumerable<Win32Process> lockingProcess = null)
+		private Task<DialogResult> GetFileInUseDialog(IEnumerable<string> source, IEnumerable<Win32Process> lockingProcess)
 		{
 			var titleText = Strings.FileInUseDialogTitle.GetLocalizedResource();
 			var subtitleText = lockingProcess.IsEmpty()
@@ -867,10 +890,10 @@ private Task<DialogResult> GetFileInUseDialog(IEnumerable<string> source, IEnume
 				sourceCount > 1 ? Strings.Skip.GetLocalizedResource() : Strings.Cancel.GetLocalizedResource());
 		}
 
-		private async Task<DialogResult> GetFileListDialog(IEnumerable<string> source, string titleText, string descriptionText = null, string primaryButtonText = null, string secondaryButtonText = null, string closeButtonText = null)
+		private async Task<DialogResult> GetFileListDialog(IEnumerable<string> source, string titleText, string? descriptionText = null, string? primaryButtonText = null, string? secondaryButtonText = null, string? closeButtonText = null)
 		{
 			var incomingItems = new List<BaseFileSystemDialogItemViewModel>();
-			List<ShellFileItem> binItems = null;
+			List<ShellFileItem>? binItems = null;
 			foreach (var src in source)
 			{
 				if (StorageTrashBinService.IsUnderTrashBin(src))
@@ -902,15 +925,34 @@ private async Task<DialogResult> GetFileListDialog(IEnumerable<string> source, s
 
 		private IEnumerable<Win32Process> WhoIsLocking(IEnumerable<string> filesToCheck)
 		{
-			return FileOperationsHelpers.CheckFileInUse(filesToCheck.ToArray());
+			return FileOperationsHelpers.CheckFileInUse(filesToCheck.ToArray()) ?? [];
 		}
 
-		public void Dispose()
+		private static IEnumerable<(ShellOperationItemResult Result, string Source, string Destination)> GetSuccessfulResults(IEnumerable<ShellOperationItemResult> results)
+		{
+			foreach (var result in results)
+			{
+				if (result is { Succeeded: true, Source: { } source, Destination: { } destination } &&
+					source != destination)
+				{
+					yield return (result, source, destination);
+				}
+			}
+		}
+
+		private static string? GetRecycleMetadataPath(string recyclePath)
 		{
-			_filesystemOperations?.Dispose();
+			var parentPath = Path.GetDirectoryName(recyclePath);
+			var fileName = Path.GetFileName(recyclePath);
 
-			_filesystemOperations = null;
-			_associatedInstance = null;
+			return parentPath is not null && !string.IsNullOrEmpty(fileName)
+				? Path.Combine(parentPath, fileName.Replace("$R", "$I", StringComparison.Ordinal))
+				: null;
+		}
+
+		public void Dispose()
+		{
+			_filesystemOperations.Dispose();
 		}
 	}
 }
diff --git a/src/Files.App/Utils/Storage/Search/FolderSearch.cs b/src/Files.App/Utils/Storage/Search/FolderSearch.cs
index dcb61192fffd..d840f0202444 100644
--- a/src/Files.App/Utils/Storage/Search/FolderSearch.cs
+++ b/src/Files.App/Utils/Storage/Search/FolderSearch.cs
@@ -87,7 +87,7 @@ public async Task SearchAsync(IList<ListedItem> results, CancellationToken token
 				}
 				else
 				{
-					await AddItemsAsync(Folder, results, token);
+					await AddItemsAsync(Folder ?? throw new InvalidOperationException("The search folder has not been set."), results, token);
 				}
 			}
 			catch (OperationCanceledException)
@@ -110,7 +110,7 @@ private async Task AddItemsForHomeAsync(IList<ListedItem> results, CancellationT
 			{
 				foreach (var drive in drivesViewModel.Drives.ToList().Cast<DriveItem>().Where(x => !x.IsNetwork))
 				{
-					await AddItemsAsync(drive.Path, results, token);
+					await AddItemsAsync(drive.Path!, results, token);
 				}
 			}
 		}
@@ -131,7 +131,7 @@ public async Task<ObservableCollection<ListedItem>> SearchAsync()
 				}
 				else
 				{
-					await AddItemsAsync(Folder, results, token);
+					await AddItemsAsync(Folder ?? throw new InvalidOperationException("The search folder has not been set."), results, token);
 				}
 			}
 			catch (Exception e)
@@ -342,8 +342,10 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can
 				{
 					try
 					{
-						IStorageItem item = (BaseStorageFile)await GetStorageFileAsync(match.FilePath);
-						item ??= (BaseStorageFolder)await GetStorageFolderAsync(match.FilePath);
+						IStorageItem? item = (await GetStorageFileAsync(match.FilePath)).Result;
+						item ??= (await GetStorageFolderAsync(match.FilePath)).Result;
+						item = item
+							?? throw new InvalidOperationException($"The search item '{match.FilePath}' could not be opened.");
 						if (!item.Name.StartsWith('.') || UserSettingsService.FoldersSettingsService.ShowDotFiles)
 							results.Add(await GetListedItemAsync(item));
 					}
@@ -376,7 +378,9 @@ private async Task AddItemsAsync(string folder, IList<ListedItem> results, Cance
 				var hiddenOnlyFromWin32 = false;
 				if (workingFolder)
 				{
-					await SearchAsync(workingFolder, results, token);
+					var storageFolder = workingFolder.Result
+						?? throw new InvalidOperationException($"The search folder '{folder}' could not be opened.");
+					await SearchAsync(storageFolder, results, token);
 					hiddenOnlyFromWin32 = (results.Count != 0);
 				}
 
@@ -467,7 +471,7 @@ await Task.Run(() =>
 				Win32PInvoke.FileTimeToSystemTime(ref shortcutFindData.ftLastWriteTime, out Win32PInvoke.SYSTEMTIME modifiedTime);
 				Win32PInvoke.FileTimeToSystemTime(ref shortcutFindData.ftCreationTime, out Win32PInvoke.SYSTEMTIME createdTime);
 				var fileSize = Win32FindDataExtensions.GetSize(shortcutFindData);
-				var itemFileExtension = shortcutFindData.cFileName.Contains('.', StringComparison.Ordinal) ? Path.GetExtension(itemPath) : null;
+				var itemFileExtension = shortcutFindData.cFileName.Contains('.', StringComparison.Ordinal) ? Path.GetExtension(itemPath)! : string.Empty;
 
 				var shortcutItem = new ShortcutItem(null)
 				{
@@ -574,7 +578,7 @@ await Task.Run(() =>
 
 		private ListedItem GetListedItemAsync(string itemPath, WIN32_FIND_DATA findData)
 		{
-			ListedItem listedItem = null;
+			ListedItem? listedItem = null;
 			var isHidden = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden;
 			var isFolder = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Directory) == FileAttributes.Directory;
 			Win32PInvoke.FileTimeToSystemTime(ref findData.ftLastWriteTime, out Win32PInvoke.SYSTEMTIME systemModifiedTimeOutput);
@@ -582,13 +586,13 @@ private ListedItem GetListedItemAsync(string itemPath, WIN32_FIND_DATA findData)
 
 			if (!isFolder)
 			{
-				string itemFileExtension = null;
-				string itemType = null;
+				string? itemFileExtension = null;
+				string? itemType = null;
 				long fileSize = Win32FindDataExtensions.GetSize(findData);
 				if (findData.cFileName.Contains('.', StringComparison.Ordinal))
 				{
 					itemFileExtension = Path.GetExtension(itemPath);
-					itemType = itemFileExtension.Trim('.') + " " + itemType;
+					itemType = itemFileExtension!.Trim('.') + " " + itemType;
 				}
 
 				listedItem = new ListedItem(null)
@@ -647,15 +651,18 @@ private ListedItem GetListedItemAsync(string itemPath, WIN32_FIND_DATA findData)
 					});
 			}
 
-			return listedItem;
+			return listedItem
+				?? throw new InvalidOperationException($"The search result '{itemPath}' is neither a file nor a folder.");
 		}
 
 		private async Task<ListedItem> GetListedItemAsync(IStorageItem item)
 		{
-			ListedItem listedItem = null;
+			ListedItem? listedItem = null;
 			if (item.IsOfType(StorageItemTypes.Folder))
 			{
-				var folder = item.AsBaseStorageFolder();
+				var folder = item.AsBaseStorageFolder()
+					?? throw new InvalidOperationException($"The search result '{item.Path}' could not be opened as a folder.");
+
 				var props = await folder.GetBasicPropertiesAsync();
 				if (folder is BinStorageFolder binFolder)
 				{
@@ -692,14 +699,16 @@ private async Task<ListedItem> GetListedItemAsync(IStorageItem item)
 			}
 			else if (item.IsOfType(StorageItemTypes.File))
 			{
-				var file = item.AsBaseStorageFile();
+				var file = item.AsBaseStorageFile()
+					?? throw new InvalidOperationException($"The search result '{item.Path}' could not be opened as a file.");
+
 				var props = await file.GetBasicPropertiesAsync();
-				string itemFileExtension = null;
-				string itemType = null;
+				string? itemFileExtension = null;
+				string? itemType = null;
 				if (file.Name.Contains('.', StringComparison.Ordinal))
 				{
 					itemFileExtension = Path.GetExtension(file.Path);
-					itemType = itemFileExtension.Trim('.') + " " + itemType;
+					itemType = itemFileExtension!.Trim('.') + " " + itemType;
 				}
 
 				var itemSize = props.Size.ToSizeString();
@@ -797,7 +806,8 @@ private async Task<ListedItem> GetListedItemAsync(IStorageItem item)
 				else
 					listedItem.NeedsPlaceholderGlyph = true;
 			}
-			return listedItem;
+			return listedItem
+				?? throw new InvalidOperationException($"The search result '{item.Path}' is neither a file nor a folder.");
 		}
 
 		private QueryOptions ToQueryOptions()
@@ -820,9 +830,9 @@ private QueryOptions ToQueryOptions()
 		}
 
 		private static Task<FilesystemResult<BaseStorageFolder>> GetStorageFolderAsync(string path)
-			=> FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path));
+			=> FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path));
 
 		private static Task<FilesystemResult<BaseStorageFile>> GetStorageFileAsync(string path)
-			=> FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(path));
+			=> FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(path));
 	}
 }
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicStorageItemExtraProperties.cs b/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicStorageItemExtraProperties.cs
index 03134b3f8125..f8edc874035b 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicStorageItemExtraProperties.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicStorageItemExtraProperties.cs
@@ -22,16 +22,16 @@ public override IAsyncOperation<IDictionary<string, object>> RetrievePropertiesA
 			{
 				var props = new Dictionary<string, object>();
 
-				propertiesToRetrieve.ForEach(x => props[x] = null);
+				propertiesToRetrieve.ForEach(x => props.SetNullablePropertyValue(x, null));
 
 				// Fill out common properties
 				var ret = _item.AsBaseStorageFile()?.GetBasicPropertiesAsync() ?? _item.AsBaseStorageFolder()?.GetBasicPropertiesAsync();
 
 				var basicProps = ret is not null ? await ret : null;
 
-				props["System.ParsingPath"] = _item?.Path;
-				props["System.DateCreated"] = basicProps?.DateCreated;
-				props["System.DateModified"] = basicProps?.DateModified;
+				props.SetNullablePropertyValue("System.ParsingPath", _item.Path);
+				props.SetNullablePropertyValue("System.DateCreated", basicProps?.DateCreated);
+				props.SetNullablePropertyValue("System.DateModified", basicProps?.DateModified);
 
 				return props;
 			});
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFile.cs b/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFile.cs
index 11f4eb53e8cd..cd35f3d86c41 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFile.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.IO;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text;
 using Windows.Foundation;
@@ -38,10 +39,11 @@ public StorageProvider? Provider
 		public abstract string FolderRelativeId { get; }
 
 		public abstract IStorageItemExtraProperties Properties { get; }
+		[MaybeNull]
 		StorageItemContentProperties IStorageItemProperties.Properties
 			=> this is SystemStorageFile file ? file.File.Properties : null;
 
-		public static implicit operator BaseStorageFile(StorageFile value)
+		public static implicit operator BaseStorageFile?(StorageFile? value)
 		{
 			return value is not null ? new SystemStorageFile(value) : null;
 		}
@@ -52,13 +54,16 @@ public static implicit operator BaseStorageFile(StorageFile value)
 
 		public abstract bool IsOfType(StorageItemTypes type);
 
-		public abstract IAsyncOperation<BaseStorageFolder> GetParentAsync();
+		public abstract IAsyncOperation<BaseStorageFolder?> GetParentAsync();
 
-		IAsyncOperation<StorageFolder> IStorageItem2.GetParentAsync()
+		IAsyncOperation<StorageFolder?> IStorageItem2.GetParentAsync()
 		{
-			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await GetParentAsync()).ToStorageFolderAsync());
+			return AsyncInfo.Run<StorageFolder?>(async (cancellationToken) =>
+			{
+				var parent = await GetParentAsync()
+					?? throw new InvalidOperationException("The file does not have an accessible parent.");
+				return await parent.ToStorageFolderAsync();
+			});
 		}
 
 		public abstract IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync();
@@ -70,43 +75,55 @@ IAsyncOperation<BasicProperties> IStorageItem.GetBasicPropertiesAsync()
 					=> await (await ToStorageFileAsync()).GetBasicPropertiesAsync());
 		}
 
-		public abstract IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode);
+		public abstract IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode);
 
-		public abstract IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options);
+		public abstract IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options);
 
-		public abstract IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsync();
+		public abstract IAsyncOperation<IRandomAccessStreamWithContentType?> OpenReadAsync();
 
-		public abstract IAsyncOperation<IInputStream> OpenSequentialReadAsync();
+		public abstract IAsyncOperation<IInputStream?> OpenSequentialReadAsync();
 
 		public abstract IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync();
 
 		public abstract IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync(StorageOpenOptions options);
 
-		public abstract IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder);
+		public abstract IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder);
 
 		IAsyncOperation<StorageFile> IStorageFile.CopyAsync(IStorageFolder destinationFolder)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await CopyAsync(destinationFolder)).ToStorageFileAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var file = await CopyAsync(destinationFolder)
+						?? throw new IOException("The storage provider did not copy the file.");
+					return await file.ToStorageFileAsync();
+				});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName);
+		public abstract IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName);
 
 		IAsyncOperation<StorageFile> IStorageFile.CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await CopyAsync(destinationFolder, desiredNewName)).ToStorageFileAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var file = await CopyAsync(destinationFolder, desiredNewName)
+						?? throw new IOException($"The storage provider did not copy the file as '{desiredNewName}'.");
+					return await file.ToStorageFileAsync();
+				});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option);
+		public abstract IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option);
 
 		IAsyncOperation<StorageFile> IStorageFile.CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await CopyAsync(destinationFolder, desiredNewName, option)).ToStorageFileAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var file = await CopyAsync(destinationFolder, desiredNewName, option)
+						?? throw new IOException($"The storage provider did not copy the file as '{desiredNewName}'.");
+					return await file.ToStorageFileAsync();
+				});
 		}
 
 		public abstract IAsyncAction MoveAsync(IStorageFolder destinationFolder);
@@ -127,37 +144,38 @@ IAsyncOperation<StorageFile> IStorageFile.CopyAsync(IStorageFolder destinationFo
 
 		public abstract IAsyncAction DeleteAsync(StorageDeleteOption option);
 
-		public abstract IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode);
+		public abstract IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode);
 
-		public abstract IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize);
+		public abstract IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize);
 
-		public abstract IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options);
+		public abstract IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options);
 
-		public IAsyncOperation<StorageItemThumbnail> GetScaledImageAsThumbnailAsync(ThumbnailMode mode)
+		public IAsyncOperation<StorageItemThumbnail?> GetScaledImageAsThumbnailAsync(ThumbnailMode mode)
 		{
-			return Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+			return Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 		}
 
-		public IAsyncOperation<StorageItemThumbnail> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+		public IAsyncOperation<StorageItemThumbnail?> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize)
 		{
-			return Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+			return Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 		}
 
-		public IAsyncOperation<StorageItemThumbnail> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public IAsyncOperation<StorageItemThumbnail?> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 		{
-			return Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+			return Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 		}
 
-		public static IAsyncOperation<BaseStorageFile> GetFileFromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFile?> GetFileFromPathAsync(string path)
 		{
-			return AsyncInfo.Run(async (cancellationToken)
+			return AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken)
 					=> await ZipStorageFile.FromPathAsync(path) ?? await FtpStorageFile.FromPathAsync(path) ?? await ShellStorageFile.FromPathAsync(path) ?? await NativeStorageFile.FromPathAsync(path) ?? await SystemStorageFile.FromPathAsync(path)
 				);
 		}
 
 		public async Task<string> ReadTextAsync(int maxLength = -1)
 		{
-			using var inputStream = await OpenReadAsync();
+			using var inputStream = await OpenReadAsync()
+				?? throw new IOException("The file could not be opened for reading.");
 			await using var stream = inputStream.AsStreamForRead();
 			using var dataReader = new StreamReader(stream, true);
 			StringBuilder builder = new();
@@ -174,7 +192,8 @@ public async Task<string> ReadTextAsync(int maxLength = -1)
 
 		public async Task WriteTextAsync(string text)
 		{
-			using var stream = await OpenAsync(FileAccessMode.ReadWrite, StorageOpenOptions.AllowOnlyReaders);
+			using var stream = await OpenAsync(FileAccessMode.ReadWrite, StorageOpenOptions.AllowOnlyReaders)
+				?? throw new IOException("The file could not be opened for writing.");
 			using var outputStream = stream.GetOutputStreamAt(0);
 			using var dataWriter = new DataWriter(outputStream);
 			dataWriter.WriteString(text);
@@ -184,7 +203,8 @@ public async Task WriteTextAsync(string text)
 
 		public async Task WriteBytesAsync(byte[] dataBytes)
 		{
-			using var stream = await OpenAsync(FileAccessMode.ReadWrite, StorageOpenOptions.AllowOnlyReaders);
+			using var stream = await OpenAsync(FileAccessMode.ReadWrite, StorageOpenOptions.AllowOnlyReaders)
+				?? throw new IOException("The file could not be opened for writing.");
 			using var outputStream = stream.GetOutputStreamAt(0);
 			using var dataWriter = new DataWriter(outputStream);
 			dataWriter.WriteBytes(dataBytes);
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFolder.cs b/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFolder.cs
index 5517798b8727..474f59d5363c 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFolder.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFolder.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.Foundation;
 using Windows.Storage;
@@ -30,10 +31,11 @@ public StorageProvider? Provider
 
 		public abstract IStorageItemExtraProperties Properties { get; }
 
+		[MaybeNull]
 		StorageItemContentProperties IStorageItemProperties.Properties
 			=> this is SystemStorageFolder folder ? folder.Folder.Properties : null;
 
-		public static implicit operator BaseStorageFolder(StorageFolder value)
+		public static implicit operator BaseStorageFolder?(StorageFolder? value)
 		{
 			return
 				value is not null
@@ -49,11 +51,16 @@ value is not null
 
 		public abstract IAsyncOperation<IndexedState> GetIndexedStateAsync();
 
-		public abstract IAsyncOperation<BaseStorageFolder> GetParentAsync();
+		public abstract IAsyncOperation<BaseStorageFolder?> GetParentAsync();
 
-		IAsyncOperation<StorageFolder> IStorageItem2.GetParentAsync()
+		IAsyncOperation<StorageFolder?> IStorageItem2.GetParentAsync()
 		{
-			return AsyncInfo.Run(async (cancellationToken) => await (await GetParentAsync()).ToStorageFolderAsync());
+			return AsyncInfo.Run<StorageFolder?>(async (cancellationToken) =>
+			{
+				var parent = await GetParentAsync()
+					?? throw new InvalidOperationException("The folder does not have an accessible parent.");
+				return await parent.ToStorageFolderAsync();
+			});
 		}
 
 		public abstract IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync();
@@ -63,130 +70,173 @@ IAsyncOperation<BasicProperties> IStorageItem.GetBasicPropertiesAsync()
 			return AsyncInfo.Run(async (cancellationToken) => await (await ToStorageFolderAsync()).GetBasicPropertiesAsync());
 		}
 
-		public abstract IAsyncOperation<IStorageItem> GetItemAsync(string name);
+		public abstract IAsyncOperation<IStorageItem?> GetItemAsync(string name);
 
-		public abstract IAsyncOperation<IStorageItem> TryGetItemAsync(string name);
+		public abstract IAsyncOperation<IStorageItem?> TryGetItemAsync(string name);
 
-		public abstract IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync();
+		public abstract IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync();
 
-		public abstract IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve);
+		public abstract IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve);
 
-		public abstract IAsyncOperation<BaseStorageFile> GetFileAsync(string name);
+		public abstract IAsyncOperation<BaseStorageFile?> GetFileAsync(string name);
 
 		IAsyncOperation<StorageFile> IStorageFolder.GetFileAsync(string name)
 		{
-			return AsyncInfo.Run(async (cancellationToken) => await (await GetFileAsync(name)).ToStorageFileAsync());
+			return AsyncInfo.Run(async (cancellationToken) =>
+			{
+				var file = await GetFileAsync(name)
+					?? throw new System.IO.FileNotFoundException($"The file '{name}' was not found.", name);
+				return await file.ToStorageFileAsync();
+			});
 		}
 
-		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync();
+		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync();
 
 		IAsyncOperation<IReadOnlyList<StorageFile>> IStorageFolder.GetFilesAsync()
 		{
-			return
-				AsyncInfo.Run<IReadOnlyList<StorageFile>>(async (cancellationToken)
-					=> await Task.WhenAll((await GetFilesAsync()).Select(x => x.ToStorageFileAsync().AsTask())));
+			return AsyncInfo.Run<IReadOnlyList<StorageFile>>(async (cancellationToken) =>
+			{
+				var files = await GetFilesAsync()
+					?? throw new InvalidOperationException("The storage provider did not return a file list.");
+				return await Task.WhenAll(files.Select(x => x.ToStorageFileAsync().AsTask()));
+			});
 		}
 
-		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query);
+		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query);
 
 		IAsyncOperation<IReadOnlyList<StorageFile>> IStorageFolderQueryOperations.GetFilesAsync(CommonFileQuery query)
 		{
-			return
-				AsyncInfo.Run<IReadOnlyList<StorageFile>>(async (cancellationToken)
-					=> await Task.WhenAll((await GetFilesAsync(query)).Select(x => x.ToStorageFileAsync().AsTask())));
+			return AsyncInfo.Run<IReadOnlyList<StorageFile>>(async (cancellationToken) =>
+			{
+				var files = await GetFilesAsync(query)
+					?? throw new InvalidOperationException("The storage provider did not return a file list.");
+				return await Task.WhenAll(files.Select(x => x.ToStorageFileAsync().AsTask()));
+			});
 		}
 
-		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve);
+		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve);
 
 		IAsyncOperation<IReadOnlyList<StorageFile>> IStorageFolderQueryOperations.GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
 		{
-			return
-				AsyncInfo.Run<IReadOnlyList<StorageFile>>(async (cancellationToken)
-					=> await Task.WhenAll((await GetFilesAsync(query, startIndex, maxItemsToRetrieve)).Select(x => x.ToStorageFileAsync().AsTask())));
+			return AsyncInfo.Run<IReadOnlyList<StorageFile>>(async (cancellationToken) =>
+			{
+				var files = await GetFilesAsync(query, startIndex, maxItemsToRetrieve)
+					?? throw new InvalidOperationException("The storage provider did not return a file list.");
+				return await Task.WhenAll(files.Select(x => x.ToStorageFileAsync().AsTask()));
+			});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFolder> GetFolderAsync(string name);
+		public abstract IAsyncOperation<BaseStorageFolder?> GetFolderAsync(string name);
 
 		IAsyncOperation<StorageFolder> IStorageFolder.GetFolderAsync(string name)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await GetFolderAsync(name)).ToStorageFolderAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var folder = await GetFolderAsync(name)
+						?? throw new System.IO.DirectoryNotFoundException($"The folder '{name}' was not found.");
+					return await folder.ToStorageFolderAsync();
+				});
 		}
 
-		public static IAsyncOperation<BaseStorageFolder> GetFolderFromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFolder?> GetFolderFromPathAsync(string path)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
+				AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken)
 					=> await ZipStorageFolder.FromPathAsync(path) ?? await FtpStorageFolder.FromPathAsync(path) ?? await ShellStorageFolder.FromPathAsync(path) ?? await SystemStorageFolder.FromPathAsync(path));
 		}
 
-		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync();
+		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync();
 
 		IAsyncOperation<IReadOnlyList<StorageFolder>> IStorageFolder.GetFoldersAsync()
 		{
-			return
-				AsyncInfo.Run<IReadOnlyList<StorageFolder>>(async (cancellationToken)
-					=> await Task.WhenAll((await GetFoldersAsync()).Select(x => x.ToStorageFolderAsync().AsTask())));
+			return AsyncInfo.Run<IReadOnlyList<StorageFolder>>(async (cancellationToken) =>
+			{
+				var folders = await GetFoldersAsync()
+					?? throw new InvalidOperationException("The storage provider did not return a folder list.");
+				return await Task.WhenAll(folders.Select(x => x.ToStorageFolderAsync().AsTask()));
+			});
 		}
 
-		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query);
+		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query);
 
 		IAsyncOperation<IReadOnlyList<StorageFolder>> IStorageFolderQueryOperations.GetFoldersAsync(CommonFolderQuery query)
 		{
-			return
-				AsyncInfo.Run<IReadOnlyList<StorageFolder>>(async (cancellationToken)
-					=> await Task.WhenAll((await GetFoldersAsync(query)).Select(x => x.ToStorageFolderAsync().AsTask())));
+			return AsyncInfo.Run<IReadOnlyList<StorageFolder>>(async (cancellationToken) =>
+			{
+				var folders = await GetFoldersAsync(query)
+					?? throw new InvalidOperationException("The storage provider did not return a folder list.");
+				return await Task.WhenAll(folders.Select(x => x.ToStorageFolderAsync().AsTask()));
+			});
 		}
 
-		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve);
+		public abstract IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve);
 
 		IAsyncOperation<IReadOnlyList<StorageFolder>> IStorageFolderQueryOperations.GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
 		{
-			return
-				AsyncInfo.Run<IReadOnlyList<StorageFolder>>(async (cancellationToken)
-					=> await Task.WhenAll((await GetFoldersAsync(query, startIndex, maxItemsToRetrieve)).Select(x => x.ToStorageFolderAsync().AsTask())));
+			return AsyncInfo.Run<IReadOnlyList<StorageFolder>>(async (cancellationToken) =>
+			{
+				var folders = await GetFoldersAsync(query, startIndex, maxItemsToRetrieve)
+					?? throw new InvalidOperationException("The storage provider did not return a folder list.");
+				return await Task.WhenAll(folders.Select(x => x.ToStorageFolderAsync().AsTask()));
+			});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName);
+		public abstract IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName);
 
 		IAsyncOperation<StorageFile> IStorageFolder.CreateFileAsync(string desiredName)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await CreateFileAsync(desiredName)).ToStorageFileAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var file = await CreateFileAsync(desiredName)
+						?? throw new System.IO.IOException($"The storage provider did not create file '{desiredName}'.");
+					return await file.ToStorageFileAsync();
+				});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName, CreationCollisionOption options);
+		public abstract IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName, CreationCollisionOption options);
 
 		IAsyncOperation<StorageFile> IStorageFolder.CreateFileAsync(string desiredName, CreationCollisionOption options)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await CreateFileAsync(desiredName, options)).ToStorageFileAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var file = await CreateFileAsync(desiredName, options)
+						?? throw new System.IO.IOException($"The storage provider did not create file '{desiredName}'.");
+					return await file.ToStorageFileAsync();
+				});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName);
+		public abstract IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName);
 
 		IAsyncOperation<StorageFolder> IStorageFolder.CreateFolderAsync(string desiredName)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await CreateFolderAsync(desiredName)).ToStorageFolderAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var folder = await CreateFolderAsync(desiredName)
+						?? throw new System.IO.IOException($"The storage provider did not create folder '{desiredName}'.");
+					return await folder.ToStorageFolderAsync();
+				});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName, CreationCollisionOption options);
+		public abstract IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName, CreationCollisionOption options);
 
 		IAsyncOperation<StorageFolder> IStorageFolder.CreateFolderAsync(string desiredName, CreationCollisionOption options)
 		{
 			return
-				AsyncInfo.Run(async (cancellationToken)
-					=> await (await CreateFolderAsync(desiredName, options)).ToStorageFolderAsync());
+				AsyncInfo.Run(async (cancellationToken) =>
+				{
+					var folder = await CreateFolderAsync(desiredName, options)
+						?? throw new System.IO.IOException($"The storage provider did not create folder '{desiredName}'.");
+					return await folder.ToStorageFolderAsync();
+				});
 		}
 
-		public abstract IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder);
+		public abstract IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder);
 
-		public abstract IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option);
+		public abstract IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option);
 
 		public abstract IAsyncAction RenameAsync(string desiredName);
 
@@ -196,23 +246,23 @@ IAsyncOperation<StorageFolder> IStorageFolder.CreateFolderAsync(string desiredNa
 
 		public abstract IAsyncAction DeleteAsync(StorageDeleteOption option);
 
-		public abstract IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode);
+		public abstract IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode);
 
-		public abstract IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize);
+		public abstract IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize);
 
-		public abstract IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options);
+		public abstract IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options);
 
-		public IAsyncOperation<StorageItemThumbnail> GetScaledImageAsThumbnailAsync(ThumbnailMode mode)
+		public IAsyncOperation<StorageItemThumbnail?> GetScaledImageAsThumbnailAsync(ThumbnailMode mode)
 		{
-			return Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+			return Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 		}
 
-		public IAsyncOperation<StorageItemThumbnail> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+		public IAsyncOperation<StorageItemThumbnail?> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 
-		public IAsyncOperation<StorageItemThumbnail> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public IAsyncOperation<StorageItemThumbnail?> GetScaledImageAsThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 		{
-			return Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+			return Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 		}
 
 		public abstract bool AreQueryOptionsSupported(QueryOptions queryOptions);
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageItemExtraProperties.cs b/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageItemExtraProperties.cs
index 1c2f532e3498..616190633039 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageItemExtraProperties.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageItemExtraProperties.cs
@@ -16,7 +16,7 @@ public virtual IAsyncOperation<IDictionary<string, object>> RetrievePropertiesAs
 				AsyncInfo.Run((cancellationToken) =>
 				{
 					var props = new Dictionary<string, object>();
-					propertiesToRetrieve.ForEach(x => props[x] = null);
+					propertiesToRetrieve.ForEach(x => props.SetNullablePropertyValue(x, null));
 
 					return Task.FromResult<IDictionary<string, object>>(props);
 				});
@@ -31,5 +31,29 @@ public virtual IAsyncAction SavePropertiesAsync([HasVariant] IEnumerable<KeyValu
 		{
 			return Task.CompletedTask.AsAsyncAction();
 		}
+
+	}
+
+	public static class StorageItemExtraPropertiesExtensions
+	{
+		public static IAsyncAction SaveNullablePropertiesAsync(
+			this IStorageItemExtraProperties properties,
+			IEnumerable<KeyValuePair<string, object?>> propertiesToSave)
+		{
+			return properties.SavePropertiesAsync(propertiesToSave.Select(
+				static property => new KeyValuePair<string, object>(property.Key, ToWinRtPropertyValue(property.Value))));
+		}
+
+		internal static void SetNullablePropertyValue(
+			this IDictionary<string, object> properties,
+			string name,
+			object? value)
+		{
+			properties[name] = ToWinRtPropertyValue(value);
+		}
+
+		// WinRT property bags use null for unavailable values despite the projected object contract.
+		private static object ToWinRtPropertyValue(object? value)
+			=> value!;
 	}
 }
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFile.cs b/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFile.cs
index c8e9d201cce1..85055765180a 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFile.cs
@@ -13,14 +13,20 @@ public interface IBaseStorageFile : IStorageItem2, IStorageFile, IStorageFile2,
 
 		IAsyncOperation<StorageFile> ToStorageFileAsync();
 
-		new IAsyncOperation<BaseStorageFolder> GetParentAsync();
+		new IAsyncOperation<BaseStorageFolder?> GetParentAsync();
 
 		new IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync();
 
-		new IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder);
+		new IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder);
 
-		new IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName);
+		new IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName);
 
-		new IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option);
+		new IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option);
+
+		new IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode);
+
+		new IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize);
+
+		new IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options);
 	}
 }
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFolder.cs b/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFolder.cs
index 44827c86732b..bd3343ec5b40 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFolder.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/IBaseStorageFolder.cs
@@ -14,40 +14,48 @@ public interface IBaseStorageFolder : IStorageItem2, IStorageFolder, IStorageFol
 
 		IAsyncOperation<StorageFolder> ToStorageFolderAsync();
 
-		new IAsyncOperation<BaseStorageFolder> GetParentAsync();
+		new IAsyncOperation<BaseStorageFolder?> GetParentAsync();
 
 		new IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync();
 
-		new IAsyncOperation<IStorageItem> GetItemAsync(string name);
+		new IAsyncOperation<IStorageItem?> GetItemAsync(string name);
 
-		new IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync();
+		new IAsyncOperation<IStorageItem?> TryGetItemAsync(string name);
 
-		new IAsyncOperation<BaseStorageFile> GetFileAsync(string name);
+		new IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync();
 
-		new IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync();
+		new IAsyncOperation<BaseStorageFile?> GetFileAsync(string name);
 
-		new IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query);
+		new IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync();
 
-		new IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve);
+		new IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query);
 
-		new IAsyncOperation<BaseStorageFolder> GetFolderAsync(string name);
+		new IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve);
 
-		new IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync();
+		new IAsyncOperation<BaseStorageFolder?> GetFolderAsync(string name);
 
-		new IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query);
+		new IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync();
 
-		new IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve);
+		new IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query);
 
-		new IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName);
+		new IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve);
 
-		new IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName, CreationCollisionOption options);
+		new IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName);
 
-		new IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName);
+		new IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName, CreationCollisionOption options);
 
-		new IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName, CreationCollisionOption options);
+		new IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName);
 
-		IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder);
-		IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option);
+		new IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName, CreationCollisionOption options);
+
+		IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder);
+		IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option);
+
+		new IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode);
+
+		new IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize);
+
+		new IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options);
 
 		new BaseStorageItemQueryResult CreateItemQueryWithOptions(QueryOptions queryOptions);
 
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/ICreateFileWithStream.cs b/src/Files.App/Utils/Storage/StorageBaseItems/ICreateFileWithStream.cs
index 8eed297359fb..2c7fded647de 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/ICreateFileWithStream.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/ICreateFileWithStream.cs
@@ -9,8 +9,8 @@ namespace Files.App.Utils.Storage
 {
 	public interface ICreateFileWithStream
 	{
-		IAsyncOperation<BaseStorageFile> CreateFileAsync(Stream contents, string desiredName);
+		IAsyncOperation<BaseStorageFile?> CreateFileAsync(Stream contents, string desiredName);
 
-		IAsyncOperation<BaseStorageFile> CreateFileAsync(Stream contents, string desiredName, CreationCollisionOption options);
+		IAsyncOperation<BaseStorageFile?> CreateFileAsync(Stream contents, string desiredName, CreationCollisionOption options);
 	}
 }
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/IPasswordProtectedItem.cs b/src/Files.App/Utils/Storage/StorageBaseItems/IPasswordProtectedItem.cs
index 7278d390cd27..dacdbdfd2af8 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/IPasswordProtectedItem.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/IPasswordProtectedItem.cs
@@ -8,9 +8,9 @@ namespace Files.App.Utils.Storage
 {
 	public interface IPasswordProtectedItem
 	{
-		StorageCredential Credentials { get; set; }
+		StorageCredential? Credentials { get; set; }
 
-		Func<IPasswordProtectedItem, Task<StorageCredential>> PasswordRequestedCallback { get; set; }
+		Func<IPasswordProtectedItem, Task<StorageCredential>>? PasswordRequestedCallback { get; set; }
 
 		async Task<TOut> RetryWithCredentialsAsync<TOut>(Func<Task<TOut>> func, Exception exception)
 		{
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/StorageCredential.cs b/src/Files.App/Utils/Storage/StorageBaseItems/StorageCredential.cs
index 8687d7fa078b..7175021fc739 100644
--- a/src/Files.App/Utils/Storage/StorageBaseItems/StorageCredential.cs
+++ b/src/Files.App/Utils/Storage/StorageBaseItems/StorageCredential.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Security;
 
@@ -10,6 +11,7 @@ namespace Files.App.Utils.Storage
 	public sealed class StorageCredential
 	{
 		private string _userName = string.Empty;
+		[AllowNull]
 		public string UserName
 		{
 			get => _userName;
@@ -17,6 +19,7 @@ public string UserName
 		}
 
 		private object? _password;
+		[AllowNull]
 		public string Password
 		{
 			get
@@ -36,6 +39,7 @@ public string Password
 			}
 		}
 
+		[AllowNull]
 		public SecureString SecurePassword
 		{
 			get
diff --git a/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs b/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs
index 3a5a55e4460d..3b037da25103 100644
--- a/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs
@@ -58,7 +58,7 @@ public virtual IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
 			});
 		}
 
-		public virtual StorageItemQueryResult ToStorageItemQueryResult() => null;
+		public virtual StorageItemQueryResult? ToStorageItemQueryResult() => null;
 	}
 
 	public class BaseStorageFileQueryResult
@@ -110,7 +110,7 @@ public virtual IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync()
 			});
 		}
 
-		public virtual StorageFileQueryResult ToStorageFileQueryResult() => null;
+		public virtual StorageFileQueryResult? ToStorageFileQueryResult() => null;
 	}
 
 	public class BaseStorageFolderQueryResult
@@ -162,14 +162,17 @@ public virtual IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync
 			});
 		}
 
-		public virtual StorageFolderQueryResult ToStorageFolderQueryResult() => null;
+		public virtual StorageFolderQueryResult? ToStorageFolderQueryResult() => null;
 	}
 
 	public sealed class SystemStorageItemQueryResult : BaseStorageItemQueryResult
 	{
 		private StorageItemQueryResult StorageItemQueryResult { get; }
 
-		public SystemStorageItemQueryResult(StorageItemQueryResult sfqr) : base(sfqr.Folder, sfqr.GetCurrentQueryOptions())
+		public SystemStorageItemQueryResult(StorageItemQueryResult sfqr)
+			: base(
+				sfqr.Folder is { } folder ? new SystemStorageFolder(folder) : throw new ArgumentException("The query result has no source folder.", nameof(sfqr)),
+				sfqr.GetCurrentQueryOptions())
 		{
 			StorageItemQueryResult = sfqr;
 		}
@@ -179,7 +182,12 @@ public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint
 			return AsyncInfo.Run<IReadOnlyList<IStorageItem>>(async (cancellationToken) =>
 			{
 				var items = await StorageItemQueryResult.GetItemsAsync(startIndex, maxNumberOfItems);
-				return items.Select(x => x is StorageFolder ? (IStorageItem)new SystemStorageFolder(x as StorageFolder) : new SystemStorageFile(x as StorageFile)).ToList();
+				return items.Select<IStorageItem, IStorageItem>(x => x switch
+				{
+					StorageFolder folder => new SystemStorageFolder(folder),
+					StorageFile file => new SystemStorageFile(file),
+					_ => throw new InvalidOperationException("The query returned an unsupported storage item."),
+				}).ToList();
 			});
 		}
 
@@ -188,7 +196,12 @@ public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
 			return AsyncInfo.Run<IReadOnlyList<IStorageItem>>(async (cancellationToken) =>
 			{
 				var items = await StorageItemQueryResult.GetItemsAsync();
-				return items.Select(x => x is StorageFolder ? (IStorageItem)new SystemStorageFolder(x as StorageFolder) : new SystemStorageFile(x as StorageFile)).ToList();
+				return items.Select<IStorageItem, IStorageItem>(x => x switch
+				{
+					StorageFolder folder => new SystemStorageFolder(folder),
+					StorageFile file => new SystemStorageFile(file),
+					_ => throw new InvalidOperationException("The query returned an unsupported storage item."),
+				}).ToList();
 			});
 		}
 
@@ -199,7 +212,10 @@ public sealed class SystemStorageFileQueryResult : BaseStorageFileQueryResult
 	{
 		private StorageFileQueryResult StorageFileQueryResult { get; }
 
-		public SystemStorageFileQueryResult(StorageFileQueryResult sfqr) : base(sfqr.Folder, sfqr.GetCurrentQueryOptions())
+		public SystemStorageFileQueryResult(StorageFileQueryResult sfqr)
+			: base(
+				sfqr.Folder is { } folder ? new SystemStorageFolder(folder) : throw new ArgumentException("The query result has no source folder.", nameof(sfqr)),
+				sfqr.GetCurrentQueryOptions())
 		{
 			StorageFileQueryResult = sfqr;
 		}
@@ -229,7 +245,10 @@ public sealed class SystemStorageFolderQueryResult : BaseStorageFolderQueryResul
 	{
 		private StorageFolderQueryResult StorageFolderQueryResult { get; }
 
-		public SystemStorageFolderQueryResult(StorageFolderQueryResult sfqr) : base(sfqr.Folder, sfqr.GetCurrentQueryOptions())
+		public SystemStorageFolderQueryResult(StorageFolderQueryResult sfqr)
+			: base(
+				sfqr.Folder is { } folder ? new SystemStorageFolder(folder) : throw new ArgumentException("The query result has no source folder.", nameof(sfqr)),
+				sfqr.GetCurrentQueryOptions())
 		{
 			StorageFolderQueryResult = sfqr;
 		}
diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs
index ea2b0dc0b711..043d19733dc4 100644
--- a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs
@@ -40,9 +40,9 @@ public override string DisplayType
 		public override Windows.Storage.FileAttributes Attributes { get; } = Windows.Storage.FileAttributes.Normal;
 		public override IStorageItemExtraProperties Properties => new BaseBasicStorageItemExtraProperties(this);
 
-		public StorageCredential Credentials { get; set; }
+		public StorageCredential? Credentials { get; set; }
 
-		public Func<IPasswordProtectedItem, Task<StorageCredential>> PasswordRequestedCallback { get; set; }
+		public Func<IPasswordProtectedItem, Task<StorageCredential>>? PasswordRequestedCallback { get; set; }
 
 		public FtpStorageFile(string path, string name, DateTimeOffset dateCreated)
 		{
@@ -65,10 +65,10 @@ public FtpStorageFile(IStorageItemWithPath item)
 			FtpPath = FtpHelpers.GetFtpPath(item.Path);
 		}
 
-		public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFile?> FromPathAsync(string path)
 			=> FtpHelpers.IsFtpPath(path) && FtpHelpers.VerifyFtpPath(path)
-				? Task.FromResult<BaseStorageFile>(new FtpStorageFile(new StorageFileWithPath(null, path))).AsAsyncOperation()
-				: Task.FromResult<BaseStorageFile>(null).AsAsyncOperation();
+				? Task.FromResult<BaseStorageFile?>(new FtpStorageFile(new StorageFileWithPath(null, path))).AsAsyncOperation()
+				: Task.FromResult<BaseStorageFile?>(null).AsAsyncOperation();
 
 		public override IAsyncOperation<StorageFile> ToStorageFileAsync()
 			=> StorageFile.CreateStreamedFileAsync(Name, FtpDataStreamingHandlerAsync, null);
@@ -76,7 +76,7 @@ public override IAsyncOperation<StorageFile> ToStorageFileAsync()
 		public override bool IsEqual(IStorageItem item) => item?.Path == Path;
 		public override bool IsOfType(StorageItemTypes type) => type is StorageItemTypes.File;
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 		{
@@ -93,9 +93,9 @@ public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			}, (_, _) => Task.FromResult(new BaseBasicProperties())));
 		}
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode)
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStream>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStream?>(async () =>
 			{
 				var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -117,11 +117,11 @@ public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode ac
 				};
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => OpenAsync(accessMode);
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => OpenAsync(accessMode);
 
-		public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsync()
+		public override IAsyncOperation<IRandomAccessStreamWithContentType?> OpenReadAsync()
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStreamWithContentType>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStreamWithContentType?>(async () =>
 			{
 				var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -134,9 +134,9 @@ public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsyn
 				return new StreamWithContentType(nsStream);
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
-		public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
+		public override IAsyncOperation<IInputStream?> OpenSequentialReadAsync()
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IInputStream>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IInputStream?>(async () =>
 			{
 				var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -152,13 +152,13 @@ public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync() => throw new NotSupportedException();
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync(StorageOpenOptions options) => throw new NotSupportedException();
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder)
 			=> CopyAsync(destinationFolder, Name, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
 			=> CopyAsync(destinationFolder, desiredNewName, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile?>(async () =>
 			{
 				using var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -166,7 +166,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 					return null;
 				}
 
-				BaseStorageFolder destFolder = destinationFolder.AsBaseStorageFolder();
+				var destFolder = destinationFolder.AsBaseStorageFolder()
+					?? throw new NotSupportedException("The destination folder type is not supported.");
 
 				if (destFolder is ICreateFileWithStream cwsf)
 				{
@@ -175,7 +176,9 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 				}
 				else
 				{
-					BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
+					var file = await destFolder.CreateFileAsync(desiredNewName, option.Convert())
+						?? throw new IOException($"Failed to create destination file '{desiredNewName}'.");
+
 					await using var stream = await file.OpenStreamForWriteAsync();
 					return await ftpClient.DownloadStream(stream, FtpPath, token: cancellationToken) ? file : null;
 				}
@@ -194,7 +197,7 @@ public override IAsyncAction MoveAsync(IStorageFolder destinationFolder, string
 				if (!await ftpClient.EnsureConnectedAsync())
 					throw new IOException($"Failed to connect to FTP server.");
 
-				BaseStorageFolder destFolder = destinationFolder.AsBaseStorageFolder();
+				var destFolder = destinationFolder.AsBaseStorageFolder();
 
 				if (destFolder is FtpStorageFolder ftpFolder)
 				{
@@ -249,12 +252,12 @@ public override IAsyncAction DeleteAsync()
 		}
 		public override IAsyncAction DeleteAsync(StorageDeleteOption option) => DeleteAsync();
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 
 		private AsyncFtpClient GetFtpClient()
 		{
@@ -313,4 +316,4 @@ public FtpFileBasicProperties(FtpListItem item)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs
index 48ddd3d47394..848a8046f968 100644
--- a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs
@@ -25,9 +25,9 @@ public sealed partial class FtpStorageFolder : BaseStorageFolder, IPasswordProte
 		public override Windows.Storage.FileAttributes Attributes { get; } = Windows.Storage.FileAttributes.Directory;
 		public override IStorageItemExtraProperties Properties => new BaseBasicStorageItemExtraProperties(this);
 
-		public StorageCredential Credentials { get; set; }
+		public StorageCredential? Credentials { get; set; }
 
-		public Func<IPasswordProtectedItem, Task<StorageCredential>> PasswordRequestedCallback { get; set; }
+		public Func<IPasswordProtectedItem, Task<StorageCredential>>? PasswordRequestedCallback { get; set; }
 
 		public FtpStorageFolder(string path, string name, DateTimeOffset dateCreated)
 		{
@@ -50,10 +50,10 @@ public FtpStorageFolder(IStorageItemWithPath item)
 			FtpPath = FtpHelpers.GetFtpPath(item.Path);
 		}
 
-		public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFolder?> FromPathAsync(string path)
 			=> FtpHelpers.IsFtpPath(path) && FtpHelpers.VerifyFtpPath(path)
-				? Task.FromResult<BaseStorageFolder>(new FtpStorageFolder(new StorageFolderWithPath(null, path))).AsAsyncOperation()
-				: Task.FromResult<BaseStorageFolder>(null).AsAsyncOperation();
+				? Task.FromResult<BaseStorageFolder?>(new FtpStorageFolder(new StorageFolderWithPath(null, path))).AsAsyncOperation()
+				: Task.FromResult<BaseStorageFolder?>(null).AsAsyncOperation();
 
 		public override IAsyncOperation<StorageFolder> ToStorageFolderAsync() => throw new NotSupportedException();
 
@@ -64,7 +64,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 
 		public override IAsyncOperation<IndexedState> GetIndexedStateAsync() => Task.FromResult(IndexedState.NotIndexed).AsAsyncOperation();
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 		{
@@ -81,9 +81,9 @@ public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			}, (_, _) => Task.FromResult(new BaseBasicProperties())));
 		}
 
-		public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> GetItemAsync(string name)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IStorageItem>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IStorageItem?>(async () =>
 			{
 				using var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -110,7 +110,7 @@ public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
 				return null;
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
-		public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> TryGetItemAsync(string name)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -124,9 +124,9 @@ public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
 				}
 			});
 		}
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync()
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IReadOnlyList<IStorageItem>>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IReadOnlyList<IStorageItem>?>(async () =>
 			{
 				using var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -154,35 +154,57 @@ public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
 				return (IReadOnlyList<IStorageItem>)items;
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>>(async (cancellationToken)
-				=> (await GetItemsAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
-
-		public override IAsyncOperation<BaseStorageFile> GetFileAsync(string name)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFile);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<FtpStorageFile>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFilesAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken)
-				=> (await GetFilesAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
-
-		public override IAsyncOperation<BaseStorageFolder> GetFolderAsync(string name)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFolder);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<FtpStorageFolder>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFoldersAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken)
-				=> (await GetFoldersAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
-
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName)
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidOperationException("The FTP folder could not be enumerated.");
+				return items.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
+			});
+
+		public override IAsyncOperation<BaseStorageFile?> GetFileAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFile);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidOperationException("The FTP folder could not be enumerated.");
+				return items.OfType<FtpStorageFile>().ToList();
+			});
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) => await GetFilesAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) =>
+			{
+				var files = await GetFilesAsync()
+					?? throw new InvalidOperationException("The FTP folder could not be enumerated.");
+				return files.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
+			});
+
+		public override IAsyncOperation<BaseStorageFolder?> GetFolderAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFolder);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidOperationException("The FTP folder could not be enumerated.");
+				return items.OfType<FtpStorageFolder>().ToList();
+			});
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) => await GetFoldersAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) =>
+			{
+				var folders = await GetFoldersAsync()
+					?? throw new InvalidOperationException("The FTP folder could not be enumerated.");
+				return folders.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
+			});
+
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName)
 			=> CreateFileAsync(desiredName, CreationCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName, CreationCollisionOption options)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile?>(async () =>
 			{
 				using var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -229,11 +251,11 @@ public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredN
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
 
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName)
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName)
 			=> CreateFolderAsync(desiredName, CreationCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName, CreationCollisionOption options)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFolder>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFolder?>(async () =>
 			{
 				using var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
@@ -262,17 +284,17 @@ public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desi
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
 
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder)
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder)
 			=> MoveAsync(destinationFolder, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option)
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFolder>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFolder?>(async () =>
 			{
 				using var ftpClient = GetFtpClient();
 				if (!await ftpClient.EnsureConnectedAsync())
 					throw new IOException($"Failed to connect to FTP server.");
 
-				BaseStorageFolder destFolder = destinationFolder.AsBaseStorageFolder();
+				var destFolder = destinationFolder.AsBaseStorageFolder();
 
 				if (destFolder is FtpStorageFolder ftpFolder)
 				{
@@ -342,12 +364,12 @@ public override IAsyncAction DeleteAsync()
 		public override StorageFolderQueryResult CreateFolderQuery(CommonFolderQuery query) => throw new NotSupportedException();
 		public override BaseStorageFolderQueryResult CreateFolderQueryWithOptions(QueryOptions queryOptions) => new(this, queryOptions);
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 
 		private AsyncFtpClient GetFtpClient()
 		{
@@ -376,4 +398,4 @@ public FtpFolderBasicProperties(FtpListItem item)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs
index 83c5e8f829d6..26f2837c68fa 100644
--- a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs
@@ -96,15 +96,15 @@ public NativeStorageFile(string path, string name, DateTimeOffset dateCreated)
 		public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace)
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder)
 			=> CopyAsync(destinationFolder, Name, NameCollisionOption.FailIfExists);
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
 			=> CopyAsync(destinationFolder, desiredNewName, NameCollisionOption.FailIfExists);
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
 		{
-			return AsyncInfo.Run<BaseStorageFile>(async (cancellationToken) =>
+			return AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) =>
 			{
 				if (string.IsNullOrEmpty(destinationFolder.Path))
 				{
@@ -169,26 +169,26 @@ public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			return Task.FromResult(new BaseBasicProperties()).AsAsyncOperation();
 		}
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync()
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync()
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 			=> throw new NotSupportedException();
 
-		public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFile?> FromPathAsync(string path)
 		{
 			if (IsNativePath(path) && CheckAccess(path))
 			{
 				var name = IO.Path.GetFileName(path);
-				return Task.FromResult((BaseStorageFile)new NativeStorageFile(path, name[(name.LastIndexOf(':') + 1)..], DateTime.Now)).AsAsyncOperation();
+				return Task.FromResult<BaseStorageFile?>(new NativeStorageFile(path, name[(name.LastIndexOf(':') + 1)..], DateTime.Now)).AsAsyncOperation();
 			}
-			return Task.FromResult<BaseStorageFile>(null).AsAsyncOperation();
+			return Task.FromResult<BaseStorageFile?>(null).AsAsyncOperation();
 		}
 
 		private static bool CheckAccess(string path)
@@ -259,26 +259,28 @@ public override IAsyncAction MoveAsync(IStorageFolder destinationFolder, string
 			});
 		}
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode)
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode)
 		{
 			var hFile = Win32Helper.OpenFileForRead(Path, accessMode == FileAccessMode.ReadWrite);
-			return Task.FromResult(new FileStream(hFile, accessMode == FileAccessMode.ReadWrite ? FileAccess.ReadWrite : FileAccess.Read).AsRandomAccessStream()).AsAsyncOperation();
+			return Task.FromResult<IRandomAccessStream?>(new FileStream(hFile, accessMode == FileAccessMode.ReadWrite ? FileAccess.ReadWrite : FileAccess.Read).AsRandomAccessStream()).AsAsyncOperation();
 		}
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => OpenAsync(accessMode);
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => OpenAsync(accessMode);
 
-		public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsync()
+		public override IAsyncOperation<IRandomAccessStreamWithContentType?> OpenReadAsync()
 		{
-			return AsyncInfo.Run<IRandomAccessStreamWithContentType>(async (cancellationToken) =>
+			return AsyncInfo.Run<IRandomAccessStreamWithContentType?>(async (cancellationToken) =>
 			{
-				return new StreamWithContentType(await OpenAsync(FileAccessMode.Read));
+				var stream = await OpenAsync(FileAccessMode.Read)
+					?? throw new IOException("The native file could not be opened for reading.");
+				return new StreamWithContentType(stream);
 			});
 		}
 
-		public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
+		public override IAsyncOperation<IInputStream?> OpenSequentialReadAsync()
 		{
 			var hFile = Win32Helper.OpenFileForRead(Path);
-			return Task.FromResult(new FileStream(hFile, FileAccess.Read).AsInputStream()).AsAsyncOperation();
+			return Task.FromResult<IInputStream?>(new FileStream(hFile, FileAccess.Read).AsInputStream()).AsAsyncOperation();
 		}
 
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync()
@@ -294,7 +296,8 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
-				string destination = IO.Path.Combine(IO.Path.GetDirectoryName(Path), desiredName);
+				var parentPath = IO.Path.GetDirectoryName(Path) ?? throw new InvalidOperationException("The file path has no parent.");
+				string destination = IO.Path.Combine(parentPath, desiredName);
 				var destFile = new NativeStorageFile(destination, desiredName, DateTime.Now);
 				if (!IsAlternateStream)
 				{
diff --git a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs
index 1ef3e7343109..0acdbc70fc69 100644
--- a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs
@@ -13,9 +13,9 @@ namespace Files.App.Utils.Storage
 {
 	public sealed partial class ShortcutStorageFile : ShellStorageFile, IShortcutStorageItem
 	{
-		public string TargetPath { get; }
-		public string Arguments { get; }
-		public string WorkingDirectory { get; }
+		public string? TargetPath { get; }
+		public string? Arguments { get; }
+		public string? WorkingDirectory { get; }
 		public bool RunAsAdmin { get; }
 		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 
@@ -31,7 +31,7 @@ public ShortcutStorageFile(ShellLinkItem item) : base(item)
 
 	public sealed partial class BinStorageFile : ShellStorageFile, IBinStorageItem
 	{
-		public string OriginalPath { get; }
+		public string? OriginalPath { get; }
 		public DateTimeOffset DateDeleted { get; }
 
 		public BinStorageFile(ShellFileItem item) : base(item)
@@ -56,22 +56,25 @@ public partial class ShellStorageFile : BaseStorageFile
 
 		public override FileAttributes Attributes => FileAttributes.Normal | FileAttributes.ReadOnly;
 
-		private IStorageItemExtraProperties properties;
+		private IStorageItemExtraProperties? properties;
 		public override IStorageItemExtraProperties Properties => properties ??= new BaseBasicStorageItemExtraProperties(this);
 
 		public ShellStorageFile(ShellFileItem item)
 		{
-			Name = item.FileName;
-			Path = item.RecyclePath; // True path on disk
+			Name = item.FileName
+				?? throw new IO.InvalidDataException("The shell item does not have a file name.");
+			Path = item.RecyclePath // True path on disk
+				?? throw new IO.InvalidDataException("The shell item does not have a path.");
 			DateCreated = item.CreatedDate;
-			DisplayType = item.FileType;
+			DisplayType = item.FileType
+				?? throw new IO.InvalidDataException("The shell item does not have a display type.");
 		}
 
 		public override IAsyncOperation<StorageFile> ToStorageFileAsync() => throw new NotSupportedException();
 
 		public static ShellStorageFile FromShellItem(ShellFileItem item)
 		{
-			if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase))
+			if (item.RecyclePath?.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase) is true)
 				return new BinStorageFile(item);
 
 			if (item is ShellLinkItem linkItem)
@@ -80,11 +83,11 @@ public static ShellStorageFile FromShellItem(ShellFileItem item)
 			return new ShellStorageFile(item);
 		}
 
-		public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFile?> FromPathAsync(string path)
 		{
 			if (ShellStorageFolder.IsShellPath(path) && GetFile(path) is ShellFileItem file)
-				return Task.FromResult<BaseStorageFile>(FromShellItem(file)).AsAsyncOperation();
-			return Task.FromResult<BaseStorageFile>(null).AsAsyncOperation();
+				return Task.FromResult<BaseStorageFile?>(FromShellItem(file)).AsAsyncOperation();
+			return Task.FromResult<BaseStorageFile?>(null).AsAsyncOperation();
 		}
 
 		private static ShellFileItem? GetFile(string path)
@@ -104,18 +107,18 @@ public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
 		public override bool IsEqual(IStorageItem item) => item?.Path == Path;
 		public override bool IsOfType(StorageItemTypes type) => type is StorageItemTypes.File;
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync() => GetBasicProperties().AsAsyncOperation();
 
 		public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option) => throw new NotSupportedException();
 
 		public override IAsyncAction DeleteAsync() => throw new NotSupportedException();
 		public override IAsyncAction DeleteAsync(StorageDeleteOption option) => throw new NotSupportedException();
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -127,7 +130,7 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 				return await zipFile.GetThumbnailAsync(mode);
 			});
 		}
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -139,7 +142,7 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 				return await zipFile.GetThumbnailAsync(mode, requestedSize);
 			});
 		}
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -157,10 +160,10 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 		public override IAsyncAction MoveAsync(IStorageFolder destinationFolder, string desiredNewName) => throw new NotSupportedException();
 		public override IAsyncAction MoveAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option) => throw new NotSupportedException();
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode) => throw new NotSupportedException();
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => throw new NotSupportedException();
-		public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsync() => throw new NotSupportedException();
-		public override IAsyncOperation<IInputStream> OpenSequentialReadAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode) => throw new NotSupportedException();
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => throw new NotSupportedException();
+		public override IAsyncOperation<IRandomAccessStreamWithContentType?> OpenReadAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<IInputStream?> OpenSequentialReadAsync() => throw new NotSupportedException();
 
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync() => throw new NotSupportedException();
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync(StorageOpenOptions options) => throw new NotSupportedException();
diff --git a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs
index 4189cdac8474..7784c4b91547 100644
--- a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs
@@ -12,9 +12,9 @@ namespace Files.App.Utils.Storage
 {
 	public sealed partial class ShortcutStorageFolder : ShellStorageFolder, IShortcutStorageItem
 	{
-		public string TargetPath { get; }
-		public string Arguments { get; }
-		public string WorkingDirectory { get; }
+		public string? TargetPath { get; }
+		public string? Arguments { get; }
+		public string? WorkingDirectory { get; }
 		public bool RunAsAdmin { get; }
 		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 
@@ -30,15 +30,15 @@ public ShortcutStorageFolder(ShellLinkItem item) : base(item)
 
 	public interface IShortcutStorageItem : IStorageItem
 	{
-		string TargetPath { get; }
-		string Arguments { get; }
-		string WorkingDirectory { get; }
+		string? TargetPath { get; }
+		string? Arguments { get; }
+		string? WorkingDirectory { get; }
 		bool RunAsAdmin { get; }
 	}
 
 	public sealed partial class BinStorageFolder : ShellStorageFolder, IBinStorageItem
 	{
-		public string OriginalPath { get; }
+		public string? OriginalPath { get; }
 		public DateTimeOffset DateDeleted { get; }
 
 		public BinStorageFolder(ShellFileItem item) : base(item)
@@ -50,7 +50,7 @@ public BinStorageFolder(ShellFileItem item) : base(item)
 
 	public interface IBinStorageItem : IStorageItem
 	{
-		string OriginalPath { get; }
+		string? OriginalPath { get; }
 		DateTimeOffset DateDeleted { get; }
 	}
 
@@ -68,18 +68,21 @@ public partial class ShellStorageFolder : BaseStorageFolder
 
 		public ShellStorageFolder(ShellFileItem item)
 		{
-			Name = item.FileName;
-			Path = item.RecyclePath; // True path on disk
+			Name = item.FileName
+				?? throw new System.IO.InvalidDataException("The shell item does not have a file name.");
+			Path = item.RecyclePath // True path on disk
+				?? throw new System.IO.InvalidDataException("The shell item does not have a path.");
 			DateCreated = item.CreatedDate;
-			DisplayType = item.FileType;
+			DisplayType = item.FileType
+				?? throw new System.IO.InvalidDataException("The shell item does not have a display type.");
 		}
 
-		public static bool IsShellPath(string path)
+		public static bool IsShellPath(string? path)
 		{
 			return path is not null &&
-				path.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) ||
+				(path.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) ||
 				path.StartsWith("::{", StringComparison.Ordinal) ||
-				path.StartsWith(@"\\SHELL\", StringComparison.Ordinal);
+				path.StartsWith(@"\\SHELL\", StringComparison.Ordinal));
 		}
 
 		public static ShellStorageFolder FromShellItem(ShellFileItem item)
@@ -87,15 +90,15 @@ public static ShellStorageFolder FromShellItem(ShellFileItem item)
 			if (item is ShellLinkItem linkItem)
 				return new ShortcutStorageFolder(linkItem);
 
-			if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase))
+			if (item.RecyclePath?.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase) is true)
 				return new BinStorageFolder(item);
 
 			return new ShellStorageFolder(item);
 		}
 
-		public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFolder?> FromPathAsync(string path)
 		{
-			return AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) =>
+			return AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) =>
 			{
 				if (IsShellPath(path))
 				{
@@ -109,7 +112,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 			});
 		}
 
-		protected static async Task<(ShellFileItem Folder, List<ShellFileItem> Items)> GetFolderAndItems(string path, bool enumerate, int startIndex = 0, int maxItemsToRetrieve = int.MaxValue)
+		protected static async Task<(ShellFileItem? Folder, List<ShellFileItem>? Items)> GetFolderAndItems(string path, bool enumerate, int startIndex = 0, int maxItemsToRetrieve = int.MaxValue)
 		{
 			return await Win32Helper.GetShellFolderAsync(path, !enumerate, enumerate, startIndex, maxItemsToRetrieve);
 		}
@@ -121,7 +124,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 
 		public override IAsyncOperation<IndexedState> GetIndexedStateAsync() => Task.FromResult(IndexedState.NotIndexed).AsAsyncOperation();
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 		{
@@ -132,9 +135,9 @@ public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			});
 		}
 
-		public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> GetItemAsync(string name)
 		{
-			return AsyncInfo.Run<IStorageItem>(async (cancellationToken) =>
+			return AsyncInfo.Run<IStorageItem?>(async (cancellationToken) =>
 			{
 				var res = await GetFolderAndItems(Path, true);
 				if (res.Items is null)
@@ -156,7 +159,7 @@ public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
 				return ShellStorageFile.FromShellItem(entry);
 			});
 		}
-		public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> TryGetItemAsync(string name)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -170,13 +173,16 @@ public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
 				}
 			});
 		}
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
-			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>>(async (cancellationToken)
-				=> (await GetItemsAsync(0, int.MaxValue)).ToList()
-			);
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync()
+			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync(0, int.MaxValue)
+					?? throw new InvalidOperationException("The shell folder could not be enumerated.");
+				return items.ToList();
+			});
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
 		{
-			return AsyncInfo.Run<IReadOnlyList<IStorageItem>>(async (cancellationToken) =>
+			return AsyncInfo.Run<IReadOnlyList<IStorageItem>?>(async (cancellationToken) =>
 			{
 				var res = await GetFolderAndItems(Path, true, (int)startIndex, (int)maxItemsToRetrieve);
 				if (res.Items is null)
@@ -200,42 +206,56 @@ public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint
 			});
 		}
 
-		public override IAsyncOperation<BaseStorageFile> GetFileAsync(string name)
-			=> AsyncInfo.Run<BaseStorageFile>(async (cancellationToken) => await GetItemAsync(name) as ShellStorageFile);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<ShellStorageFile>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFilesAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken)
-				=> (await GetFilesAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList()
-			);
-
-		public override IAsyncOperation<BaseStorageFolder> GetFolderAsync(string name)
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => await GetItemAsync(name) as ShellStorageFolder);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<ShellStorageFolder>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFoldersAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
+		public override IAsyncOperation<BaseStorageFile?> GetFileAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) => await GetItemAsync(name) as ShellStorageFile);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidOperationException("The shell folder could not be enumerated.");
+				return items.OfType<ShellStorageFile>().ToList();
+			});
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) => await GetFilesAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) =>
+			{
+				var files = await GetFilesAsync()
+					?? throw new InvalidOperationException("The shell folder files could not be enumerated.");
+				return files.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
+			});
+
+		public override IAsyncOperation<BaseStorageFolder?> GetFolderAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => await GetItemAsync(name) as ShellStorageFolder);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidOperationException("The shell folder could not be enumerated.");
+				return items.OfType<ShellStorageFolder>().ToList();
+			});
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) => await GetFoldersAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
 		{
-			return AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken) =>
+			return AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) =>
 			{
-				var items = await GetFoldersAsync();
+				var items = await GetFoldersAsync()
+					?? throw new InvalidOperationException("The shell folder children could not be enumerated.");
 				return items.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
 			});
 		}
 
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName, CreationCollisionOption options)
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName, CreationCollisionOption options)
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
 
 		public override IAsyncAction RenameAsync(string desiredName) => throw new NotSupportedException();
 		public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption option) => throw new NotSupportedException();
@@ -258,7 +278,7 @@ public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desi
 		public override StorageFolderQueryResult CreateFolderQuery(CommonFolderQuery query) => throw new NotSupportedException();
 		public override BaseStorageFolderQueryResult CreateFolderQueryWithOptions(QueryOptions queryOptions) => new(this, queryOptions);
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -270,7 +290,7 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 				return await zipFolder.GetThumbnailAsync(mode);
 			});
 		}
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -282,7 +302,7 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 				return await zipFolder.GetThumbnailAsync(mode, requestedSize);
 			});
 		}
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
diff --git a/src/Files.App/Utils/Storage/StorageItems/StreamWithContentType.cs b/src/Files.App/Utils/Storage/StorageItems/StreamWithContentType.cs
index e12d5f143a25..c7f6261487af 100644
--- a/src/Files.App/Utils/Storage/StorageItems/StreamWithContentType.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/StreamWithContentType.cs
@@ -14,7 +14,7 @@ public sealed partial class InputStreamWithDisposeCallback : IInputStream
 	{
 		private Stream stream;
 		private IInputStream iStream;
-		public Action DisposeCallback { get; set; }
+		public Action? DisposeCallback { get; set; }
 
 		public InputStreamWithDisposeCallback(Stream stream)
 		{
@@ -43,7 +43,7 @@ public sealed partial class NonSeekableRandomAccessStreamForWrite : IRandomAcces
 		private ulong byteSize;
 		private bool isWritten;
 
-		public Action DisposeCallback { get; set; }
+		public Action? DisposeCallback { get; set; }
 
 		public NonSeekableRandomAccessStreamForWrite(Stream stream)
 		{
@@ -139,7 +139,7 @@ public sealed partial class NonSeekableRandomAccessStreamForRead : IRandomAccess
 		private ulong readToByte;
 		private ulong byteSize;
 
-		public Action DisposeCallback { get; set; }
+		public Action? DisposeCallback { get; set; }
 
 		public NonSeekableRandomAccessStreamForRead(Stream baseStream, ulong size)
 		{
diff --git a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs
index c0eb809d0c39..4b6ace859bde 100644
--- a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs
@@ -16,22 +16,26 @@ public sealed partial class SystemStorageFile : BaseStorageFile
 	{
 		public StorageFile File { get; }
 
-		public override string Path => File?.Path;
-		public override string Name => File?.Name;
-		public override string DisplayName => File?.DisplayName;
+		public override string Path => File.Path;
+		public override string Name => File.Name;
+		public override string DisplayName => File.DisplayName;
 		public override string ContentType => File.ContentType;
-		public override string DisplayType => File?.DisplayType;
+		public override string DisplayType => File.DisplayType;
 		public override string FileType => File.FileType;
-		public override string FolderRelativeId => File?.FolderRelativeId;
+		public override string FolderRelativeId => File.FolderRelativeId;
 
 		public override DateTimeOffset DateCreated => File.DateCreated;
 		public override Windows.Storage.FileAttributes Attributes => File.Attributes;
-		public override IStorageItemExtraProperties Properties => File?.Properties;
+		public override IStorageItemExtraProperties Properties => File.Properties;
 
-		public SystemStorageFile(StorageFile file) => File = file;
+		public SystemStorageFile(StorageFile file)
+		{
+			ArgumentNullException.ThrowIfNull(file);
+			File = file;
+		}
 
-		public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
-			=> AsyncInfo.Run<BaseStorageFile>(async (cancellationToken) =>
+		public static IAsyncOperation<BaseStorageFile?> FromPathAsync(string path)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) =>
 			{
 				try
 				{
@@ -54,25 +58,29 @@ public override IAsyncOperation<StorageFile> ToStorageFileAsync()
 		public override bool IsEqual(IStorageItem item) => File.IsEqual(item);
 		public override bool IsOfType(StorageItemTypes type) => File.IsOfType(type);
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync()
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken)
-				=> new SystemStorageFolder(await File.GetParentAsync())
-			);
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync()
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) =>
+			{
+				var parent = await File.GetParentAsync()
+					?? throw new InvalidOperationException("The file does not have a parent.");
+				return new SystemStorageFolder(parent);
+			});
 
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			=> AsyncInfo.Run<BaseBasicProperties>(async (cancellationToken)
 				=> new SystemFileBasicProperties(await File.GetBasicPropertiesAsync(), DateCreated)
 			);
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder)
 			=> CopyAsync(destinationFolder, Name, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
 			=> CopyAsync(destinationFolder, desiredNewName, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
 		{
-			return AsyncInfo.Run(async (cancellationToken) =>
+			return AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) =>
 			{
-				var destFolder = destinationFolder.AsBaseStorageFolder(); // Avoid calling IStorageFolder method
+				var destFolder = destinationFolder.AsBaseStorageFolder() ??
+					throw new NotSupportedException("The destination folder type is not supported."); // Avoid calling IStorageFolder method
 				try
 				{
 					if (destFolder is SystemStorageFolder sysFolder)
@@ -87,7 +95,9 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 					}
 					else
 					{
-						var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
+						var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert())
+							?? throw new IOException($"Failed to create destination file '{desiredNewName}'.");
+
 						await using (var inStream = await this.OpenStreamForReadAsync())
 						await using (var outStream = await destFile.OpenStreamForWriteAsync())
 						{
@@ -120,11 +130,11 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 			});
 		}
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode) => File.OpenAsync(accessMode);
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => File.OpenAsync(accessMode, options);
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode) => File.OpenAsync(accessMode);
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => File.OpenAsync(accessMode, options);
 
-		public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsync() => File.OpenReadAsync();
-		public override IAsyncOperation<IInputStream> OpenSequentialReadAsync() => File.OpenSequentialReadAsync();
+		public override IAsyncOperation<IRandomAccessStreamWithContentType?> OpenReadAsync() => File.OpenReadAsync();
+		public override IAsyncOperation<IInputStream?> OpenSequentialReadAsync() => File.OpenSequentialReadAsync();
 
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync() => File.OpenTransactedWriteAsync();
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync(StorageOpenOptions options) => File.OpenTransactedWriteAsync(options);
@@ -179,11 +189,11 @@ public override IAsyncAction MoveAndReplaceAsync(IStorageFile fileToReplace)
 		public override IAsyncAction DeleteAsync() => File.DeleteAsync();
 		public override IAsyncAction DeleteAsync(StorageDeleteOption option) => File.DeleteAsync(option);
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
 			=> File.GetThumbnailAsync(mode);
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
 			=> File.GetThumbnailAsync(mode, requestedSize);
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 			=> File.GetThumbnailAsync(mode, requestedSize, options);
 
 		private sealed partial class SystemFileBasicProperties : BaseBasicProperties
diff --git a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFolder.cs
index 9d7e6f2fa194..5f5aeb0ce0c4 100644
--- a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFolder.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFolder.cs
@@ -26,7 +26,11 @@ public sealed partial class SystemStorageFolder : BaseStorageFolder
 		public override FileAttributes Attributes => Folder.Attributes;
 		public override IStorageItemExtraProperties Properties => Folder.Properties;
 
-		public SystemStorageFolder(StorageFolder folder) => Folder = folder;
+		public SystemStorageFolder(StorageFolder folder)
+		{
+			ArgumentNullException.ThrowIfNull(folder);
+			Folder = folder;
+		}
 
 		public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 		{
@@ -34,11 +38,15 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 			{
 				try
 				{
-					using var shellItem = new ShellLibraryEx(Shell32.ShellUtil.GetShellItemForPath(path), true);
+					var libraryShellItem = Shell32.ShellUtil.GetShellItemForPath(path);
+					if (libraryShellItem is null)
+						throw new System.IO.FileNotFoundException($"The library '{path}' was not found.");
+
+					using var shellItem = new ShellLibraryEx(libraryShellItem, true);
 					if (shellItem is ShellLibraryEx library)
 					{
 						var libraryItem = ShellFolderExtensions.GetShellLibraryItem(library, path);
-						var firstFolder = libraryItem?.Folders.FirstOrDefault();
+						var firstFolder = libraryItem?.Folders?.FirstOrDefault();
 
 						if (firstFolder != null)
 						{
@@ -60,60 +68,65 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 		public override bool IsEqual(IStorageItem item) => Folder.IsEqual(item);
 		public override bool IsOfType(StorageItemTypes type) => Folder.IsOfType(type);
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync()
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await Folder.GetParentAsync()));
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync()
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) =>
+			{
+				var parent = await Folder.GetParentAsync()
+					?? throw new InvalidOperationException("The folder does not have a parent.");
+				return new SystemStorageFolder(parent);
+			});
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			=> AsyncInfo.Run<BaseBasicProperties>(async (cancellationToken) => new SystemFolderBasicProperties(await Folder.GetBasicPropertiesAsync(), DateCreated));
 
 		public override IAsyncOperation<IndexedState> GetIndexedStateAsync() => Folder.GetIndexedStateAsync();
 
-		public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> GetItemAsync(string name)
 			=> Folder.GetItemAsync(name);
-		public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> TryGetItemAsync(string name)
 			=> Folder.TryGetItemAsync(name);
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync()
 			=> Folder.GetItemsAsync();
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
 			=> Folder.GetItemsAsync(startIndex, maxItemsToRetrieve);
 
-		public override IAsyncOperation<BaseStorageFile> GetFileAsync(string name)
-			=> AsyncInfo.Run<BaseStorageFile>(async (cancellationToken) => new SystemStorageFile(await Folder.GetFileAsync(name)));
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken)
+		public override IAsyncOperation<BaseStorageFile?> GetFileAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) => new SystemStorageFile(await Folder.GetFileAsync(name)));
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken)
 				=> (await Folder.GetFilesAsync()).Select(item => new SystemStorageFile(item)).ToList()
 			);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken)
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken)
 				=> (await Folder.GetFilesAsync(query)).Select(x => new SystemStorageFile(x)).ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken)
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken)
 				=> (await Folder.GetFilesAsync(query, startIndex, maxItemsToRetrieve)).Select(x => new SystemStorageFile(x)).ToList());
 
-		public override IAsyncOperation<BaseStorageFolder> GetFolderAsync(string name)
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await Folder.GetFolderAsync(name)));
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken)
+		public override IAsyncOperation<BaseStorageFolder?> GetFolderAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => new SystemStorageFolder(await Folder.GetFolderAsync(name)));
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken)
 				=> (await Folder.GetFoldersAsync()).Select(item => new SystemStorageFolder(item)).ToList()
 			);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken)
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken)
 				=> (await Folder.GetFoldersAsync(query)).Select(x => new SystemStorageFolder(x)).ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken)
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken)
 				=> (await Folder.GetFoldersAsync(query, startIndex, maxItemsToRetrieve)).Select(x => new SystemStorageFolder(x)).ToList());
 
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName)
-			=> AsyncInfo.Run<BaseStorageFile>(async (cancellationToken) => new SystemStorageFile(await Folder.CreateFileAsync(desiredName)));
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName, CreationCollisionOption options)
-			=> AsyncInfo.Run<BaseStorageFile>(async (cancellationToken) => new SystemStorageFile(await Folder.CreateFileAsync(desiredName, options)));
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) => new SystemStorageFile(await Folder.CreateFileAsync(desiredName)));
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName, CreationCollisionOption options)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) => new SystemStorageFile(await Folder.CreateFileAsync(desiredName, options)));
 
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName)
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await Folder.CreateFolderAsync(desiredName)));
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName, CreationCollisionOption options)
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await Folder.CreateFolderAsync(desiredName, options)));
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => new SystemStorageFolder(await Folder.CreateFolderAsync(desiredName)));
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName, CreationCollisionOption options)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => new SystemStorageFolder(await Folder.CreateFolderAsync(desiredName, options)));
 
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
 
 		public override IAsyncAction RenameAsync(string desiredName) => Folder.RenameAsync(desiredName);
 		public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption option) => Folder.RenameAsync(desiredName, option);
@@ -144,11 +157,11 @@ public override StorageFolderQueryResult CreateFolderQuery(CommonFolderQuery que
 		public override BaseStorageFolderQueryResult CreateFolderQueryWithOptions(QueryOptions queryOptions)
 			=> new SystemStorageFolderQueryResult(Folder.CreateFolderQueryWithOptions(queryOptions));
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
 			=> Folder.GetThumbnailAsync(mode);
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
 			=> Folder.GetThumbnailAsync(mode, requestedSize);
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 			=> Folder.GetThumbnailAsync(mode, requestedSize, options);
 
 		private sealed partial class SystemFolderBasicProperties : BaseBasicProperties
diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs
index a9602339917b..dfec81bfb194 100644
--- a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs
@@ -83,39 +83,40 @@ public override IAsyncOperation<StorageFile> ToStorageFileAsync()
 
 		public override bool IsEqual(IStorageItem item) => item?.Path == Path;
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode)
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode)
 		{
-			return Task.FromResult(Contents.AsRandomAccessStream()).AsAsyncOperation();
+			return Task.FromResult<IRandomAccessStream?>(Contents.AsRandomAccessStream()).AsAsyncOperation();
 		}
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => OpenAsync(accessMode);
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options) => OpenAsync(accessMode);
 
-		public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsync()
+		public override IAsyncOperation<IRandomAccessStreamWithContentType?> OpenReadAsync()
 		{
-			return Task.FromResult<IRandomAccessStreamWithContentType>(new StreamWithContentType(Contents.AsRandomAccessStream()))
+			return Task.FromResult<IRandomAccessStreamWithContentType?>(new StreamWithContentType(Contents.AsRandomAccessStream()))
 				.AsAsyncOperation();
 		}
 
-		public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
+		public override IAsyncOperation<IInputStream?> OpenSequentialReadAsync()
 		{
-			return Task.FromResult(Contents.AsInputStream()).AsAsyncOperation();
+			return Task.FromResult<IInputStream?>(Contents.AsInputStream()).AsAsyncOperation();
 		}
 
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync() => throw new NotSupportedException();
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync(StorageOpenOptions options) => throw new NotSupportedException();
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder)
 			=> CopyAsync(destinationFolder, Name, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
 			=> CopyAsync(destinationFolder, desiredNewName, NameCollisionOption.FailIfExists);
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
 		{
-			return AsyncInfo.Run(async (cancellationToken) =>
+			return AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) =>
 			{
-				BaseStorageFolder destFolder = destinationFolder.AsBaseStorageFolder();
+				var destFolder = destinationFolder.AsBaseStorageFolder()
+					?? throw new NotSupportedException("The destination folder type is not supported.");
 
 				if (destFolder is ICreateFileWithStream cwsf)
 				{
@@ -124,7 +125,9 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 				}
 				else
 				{
-					var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
+					var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert())
+						?? throw new IOException($"Failed to create destination file '{desiredNewName}'.");
+
 					await using (var inStream = await this.OpenStreamForReadAsync())
 					await using (var outStream = await destFile.OpenStreamForWriteAsync())
 					{
@@ -153,11 +156,11 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 
 		public override IAsyncAction DeleteAsync(StorageDeleteOption option) => throw new NotSupportedException();
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 	}
 }
diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs
index d2c1b1cbc088..5cd041b3e8af 100644
--- a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFolder.cs
@@ -34,61 +34,61 @@ public VirtualStorageFolder(string cFileName)
 
 		public override IAsyncOperation<IndexedState> GetIndexedStateAsync() => Task.FromResult(IndexedState.NotIndexed).AsAsyncOperation();
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 		{
 			return Task.FromResult(new BaseBasicProperties()).AsAsyncOperation();
 		}
 
-		public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> GetItemAsync(string name)
 		{
-			return Task.FromResult<IStorageItem>(null).AsAsyncOperation();
+			return Task.FromResult<IStorageItem?>(null).AsAsyncOperation();
 		}
-		public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> TryGetItemAsync(string name)
 		{
-			return Task.FromResult<IStorageItem>(null).AsAsyncOperation();
+			return Task.FromResult<IStorageItem?>(null).AsAsyncOperation();
 		}
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync()
 		{
-			return Task.FromResult<IReadOnlyList<IStorageItem>>(new List<IStorageItem>().AsReadOnly())
+			return Task.FromResult<IReadOnlyList<IStorageItem>?>(new List<IStorageItem>().AsReadOnly())
 				.AsAsyncOperation();
 		}
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>>(async (cancellationToken)
-				=> (await GetItemsAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
-
-		public override IAsyncOperation<BaseStorageFile> GetFileAsync(string name)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFile);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<FtpStorageFile>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFilesAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken)
-				=> (await GetFilesAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
-
-		public override IAsyncOperation<BaseStorageFolder> GetFolderAsync(string name)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFolder);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<FtpStorageFolder>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFoldersAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken)
-				=> (await GetFoldersAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
-
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName)
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>?>(async (cancellationToken)
+				=> (await GetItemsAsync())!.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
+
+		public override IAsyncOperation<BaseStorageFile?> GetFileAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFile);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) => (await GetItemsAsync())!.OfType<FtpStorageFile>().ToList());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) => await GetFilesAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken)
+				=> (await GetFilesAsync())!.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
+
+		public override IAsyncOperation<BaseStorageFolder?> GetFolderAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => await GetItemAsync(name) as BaseStorageFolder);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) => (await GetItemsAsync())!.OfType<FtpStorageFolder>().ToList());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) => await GetFoldersAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken)
+				=> (await GetFoldersAsync())!.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList());
+
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName)
 			=> CreateFileAsync(desiredName, CreationCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName, CreationCollisionOption options)
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName)
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName)
 			=> CreateFolderAsync(desiredName, CreationCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName, CreationCollisionOption options)
 			=> throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
 
 		public override IAsyncAction RenameAsync(string desiredName)
 			=> RenameAsync(desiredName, NameCollisionOption.FailIfExists);
@@ -114,11 +114,11 @@ public override IAsyncAction DeleteAsync()
 		public override StorageFolderQueryResult CreateFolderQuery(CommonFolderQuery query) => throw new NotSupportedException();
 		public override BaseStorageFolderQueryResult CreateFolderQueryWithOptions(QueryOptions queryOptions) => new(this, queryOptions);
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageItem.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageItem.cs
index 4efdfcc6699e..4b7b64ef0847 100644
--- a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageItem.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageItem.cs
@@ -16,15 +16,15 @@ namespace Files.App.Utils.Storage
 	/// </summary>
 	public sealed partial class VirtualStorageItem : IStorageItem
 	{
-		private static BasicProperties props;
+		private static BasicProperties? props;
 
 		public Windows.Storage.FileAttributes Attributes { get; init; }
 
 		public DateTimeOffset DateCreated { get; init; }
 
-		public string Name { get; init; }
+		public string Name { get; init; } = null!;
 
-		public string Path { get; init; }
+		public string Path { get; init; } = null!;
 
 		private VirtualStorageItem() { }
 
@@ -32,14 +32,14 @@ public static VirtualStorageItem FromListedItem(ListedItem item)
 		{
 			return new VirtualStorageItem()
 			{
-				Name = item.ItemNameRaw,
-				Path = item.ItemPath,
+				Name = item.ItemNameRaw!,
+				Path = item.ItemPath!,
 				DateCreated = item.ItemDateCreatedReal,
 				Attributes = item.IsArchive || item.PrimaryItemAttribute == StorageItemTypes.File ? Windows.Storage.FileAttributes.Normal : Windows.Storage.FileAttributes.Directory
 			};
 		}
 
-		public static VirtualStorageItem FromPath(string path)
+		public static VirtualStorageItem? FromPath(string path)
 		{
 			Win32PInvoke.FINDEX_INFO_LEVELS findInfoLevel = Win32PInvoke.FINDEX_INFO_LEVELS.FindExInfoBasic;
 			int additionalFlags = Win32PInvoke.FIND_FIRST_EX_LARGE_FETCH;
diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs
index 373adc2e62c6..fa7737431e38 100644
--- a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs
@@ -17,7 +17,7 @@ namespace Files.App.Utils.Storage
 	public sealed partial class ZipStorageFile : BaseStorageFile, IPasswordProtectedItem
 	{
 		private readonly string containerPath;
-		private readonly BaseStorageFile backingFile;
+		private readonly BaseStorageFile? backingFile;
 
 		public override string Path { get; }
 		public override string Name { get; }
@@ -42,12 +42,14 @@ public override string DisplayType
 		public override DateTimeOffset DateCreated { get; }
 		public override Windows.Storage.FileAttributes Attributes => Windows.Storage.FileAttributes.Normal | Windows.Storage.FileAttributes.ReadOnly;
 
-		private IStorageItemExtraProperties properties;
+		private IStorageItemExtraProperties? properties;
 		public override IStorageItemExtraProperties Properties => properties ??= new BaseBasicStorageItemExtraProperties(this);
 
-		public StorageCredential Credentials { get; set; } = new();
+		public StorageCredential? Credentials { get; set; } = new();
+		private string Password => Credentials?.Password
+			?? throw new InvalidOperationException("Archive credentials are not available.");
 
-		public Func<IPasswordProtectedItem, Task<StorageCredential>> PasswordRequestedCallback { get; set; }
+		public Func<IPasswordProtectedItem, Task<StorageCredential>>? PasswordRequestedCallback { get; set; }
 
 		public ZipStorageFile(string path, string containerPath)
 		{
@@ -55,21 +57,21 @@ public ZipStorageFile(string path, string containerPath)
 			Path = path;
 			this.containerPath = containerPath;
 		}
-		public ZipStorageFile(string path, string containerPath, BaseStorageFile backingFile) : this(path, containerPath)
+		public ZipStorageFile(string path, string containerPath, BaseStorageFile? backingFile) : this(path, containerPath)
 			=> this.backingFile = backingFile;
 		public ZipStorageFile(string path, string containerPath, ArchiveFileInfo entry) : this(path, containerPath)
 			=> DateCreated = entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;
-		public ZipStorageFile(string path, string containerPath, ArchiveFileInfo entry, BaseStorageFile backingFile) : this(path, containerPath, entry)
+		public ZipStorageFile(string path, string containerPath, ArchiveFileInfo entry, BaseStorageFile? backingFile) : this(path, containerPath, entry)
 			=> this.backingFile = backingFile;
 
 		public override IAsyncOperation<StorageFile> ToStorageFileAsync()
 			=> StorageFile.CreateStreamedFileAsync(Name, ZipDataStreamingHandler(Path), null);
 
-		public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFile?> FromPathAsync(string path)
 		{
 			if (!FileExtensionHelpers.IsBrowsableZipFile(path, out var ext))
 			{
-				return Task.FromResult<BaseStorageFile>(null).AsAsyncOperation();
+				return Task.FromResult<BaseStorageFile?>(null).AsAsyncOperation();
 			}
 			var marker = path.IndexOf(ext, StringComparison.OrdinalIgnoreCase);
 			if (marker is not -1)
@@ -77,25 +79,25 @@ public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
 				var containerPath = path.Substring(0, marker + ext.Length);
 				if (path == containerPath)
 				{
-					return Task.FromResult<BaseStorageFile>(null).AsAsyncOperation(); // Root
+					return Task.FromResult<BaseStorageFile?>(null).AsAsyncOperation(); // Root
 				}
 				if (CheckAccess(containerPath))
 				{
-					return Task.FromResult<BaseStorageFile>(new ZipStorageFile(path, containerPath)).AsAsyncOperation();
+					return Task.FromResult<BaseStorageFile?>(new ZipStorageFile(path, containerPath)).AsAsyncOperation();
 				}
 			}
-			return Task.FromResult<BaseStorageFile>(null).AsAsyncOperation();
+			return Task.FromResult<BaseStorageFile?>(null).AsAsyncOperation();
 		}
 
 		public override bool IsEqual(IStorageItem item) => item?.Path == Path;
 		public override bool IsOfType(StorageItemTypes type) => type is StorageItemTypes.File;
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync() => GetBasicProperties().AsAsyncOperation();
 
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode)
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStream>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStream?>(async () =>
 			{
 				bool rw = accessMode is FileAccessMode.ReadWrite;
 				if (Path == containerPath)
@@ -111,7 +113,7 @@ public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode ac
 
 				if (!rw)
 				{
-					SevenZipExtractor zipFile = await OpenZipFileAsync();
+					SevenZipExtractor? zipFile = await OpenZipFileAsync();
 					if (zipFile is null || zipFile.ArchiveFileData is null)
 					{
 						return null;
@@ -136,12 +138,12 @@ public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode ac
 				throw new NotSupportedException("Can't open zip file as RW");
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
-		public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options)
+		public override IAsyncOperation<IRandomAccessStream?> OpenAsync(FileAccessMode accessMode, StorageOpenOptions options)
 			=> OpenAsync(accessMode);
 
-		public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsync()
+		public override IAsyncOperation<IRandomAccessStreamWithContentType?> OpenReadAsync()
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStreamWithContentType>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IRandomAccessStreamWithContentType?>(async () =>
 			{
 				if (Path == containerPath)
 				{
@@ -154,7 +156,7 @@ public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsyn
 					return hFile.IsInvalid ? null : new StreamWithContentType(new FileStream(hFile, FileAccess.Read).AsRandomAccessStream());
 				}
 
-				SevenZipExtractor zipFile = await OpenZipFileAsync();
+				SevenZipExtractor? zipFile = await OpenZipFileAsync();
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
 					return null;
@@ -178,9 +180,9 @@ public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsyn
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
 
-		public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
+		public override IAsyncOperation<IInputStream?> OpenSequentialReadAsync()
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IInputStream>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IInputStream?>(async () =>
 			{
 				if (Path == containerPath)
 				{
@@ -193,7 +195,7 @@ public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
 					return hFile.IsInvalid ? null : new FileStream(hFile, FileAccess.Read).AsInputStream();
 				}
 
-				SevenZipExtractor zipFile = await OpenZipFileAsync();
+				SevenZipExtractor? zipFile = await OpenZipFileAsync();
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
 					return null;
@@ -220,15 +222,15 @@ public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsy
 		public override IAsyncOperation<StorageStreamTransaction> OpenTransactedWriteAsync(StorageOpenOptions options)
 			=> throw new NotSupportedException();
 
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder)
 			=> CopyAsync(destinationFolder, Name, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName)
 			=> CopyAsync(destinationFolder, desiredNewName, NameCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
+		public override IAsyncOperation<BaseStorageFile?> CopyAsync(IStorageFolder destinationFolder, string desiredNewName, NameCollisionOption option)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile?>(async () =>
 			{
-				using SevenZipExtractor zipFile = await OpenZipFileAsync();
+				using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
 					return null;
@@ -241,7 +243,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 					return null;
 				}
 
-				var destFolder = destinationFolder.AsBaseStorageFolder();
+				var destFolder = destinationFolder.AsBaseStorageFolder()
+					?? throw new NotSupportedException("The destination folder type is not supported.");
 
 				if (destFolder is ICreateFileWithStream cwsf)
 				{
@@ -253,7 +256,9 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 				}
 				else
 				{
-					var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
+					var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert())
+						?? throw new IOException($"Failed to create destination file '{desiredNewName}'.");
+
 					await using var outStream = await destFile.OpenStreamForWriteAsync();
 					await SafetyExtensions.WrapAsync(() => zipFile.ExtractFileAsync(entry.Index, outStream), async (_, exception) =>
 					{
@@ -268,7 +273,7 @@ public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace)
 		{
 			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.WrapAsync(async () =>
 			{
-				using SevenZipExtractor zipFile = await OpenZipFileAsync();
+				using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
 					return;
@@ -310,7 +315,8 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 					}
 					else
 					{
-						var fileName = IO.Path.Combine(IO.Path.GetDirectoryName(Path), desiredName);
+						var parentPath = IO.Path.GetDirectoryName(Path) ?? throw new InvalidOperationException("The archive path has no parent.");
+						var fileName = IO.Path.Combine(parentPath, desiredName);
 						PInvoke.MoveFileFromApp(Path, fileName);
 					}
 				}
@@ -323,16 +329,19 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 					}
 					using (var ms = new MemoryStream())
 					{
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for reading."))
 						{
 							SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 							compressor.CustomParameters.Add("cu", "on");
 							compressor.SetFormatFromExistingArchive(archiveStream);
-							var fileName = IO.Path.GetRelativePath(containerPath, IO.Path.Combine(IO.Path.GetDirectoryName(Path), desiredName));
-							await compressor.ModifyArchiveAsync(archiveStream, new Dictionary<int, string>() { { index, fileName } }, Credentials.Password, ms);
+							var parentPath = IO.Path.GetDirectoryName(Path) ?? throw new InvalidOperationException("The archive entry has no parent.");
+							var fileName = IO.Path.GetRelativePath(containerPath, IO.Path.Combine(parentPath, desiredName));
+							await compressor.ModifyArchiveAsync(archiveStream, new Dictionary<int, string>() { { index, fileName } }, Password, ms);
 						}
 
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for writing."))
 						{
 							ms.Position = 0;
 							await ms.CopyToAsync(archiveStream);
@@ -373,14 +382,16 @@ public override IAsyncAction DeleteAsync(StorageDeleteOption option)
 					}
 					using (var ms = new MemoryStream())
 					{
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for reading."))
 						{
 							SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 							compressor.CustomParameters.Add("cu", "on");
 							compressor.SetFormatFromExistingArchive(archiveStream);
-							await compressor.ModifyArchiveAsync(archiveStream, new Dictionary<int, string>() { { index, null } }, Credentials.Password, ms);
+							await compressor.ModifyArchiveAsync(archiveStream, new Dictionary<int, string?>() { { index, null } }, Password, ms);
 						}
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for writing."))
 						{
 							ms.Position = 0;
 							await ms.CopyToAsync(archiveStream);
@@ -392,12 +403,12 @@ public override IAsyncAction DeleteAsync(StorageDeleteOption option)
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
-			=> Task.FromResult<StorageItemThumbnail>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+			=> Task.FromResult<StorageItemThumbnail?>(null).AsAsyncOperation();
 
 		private static bool CheckAccess(string path)
 		{
@@ -426,7 +437,7 @@ private static bool CheckAccess(string path)
 
 		private async Task<int> FetchZipIndex()
 		{
-			using (SevenZipExtractor zipFile = await OpenZipFileAsync())
+			using (SevenZipExtractor? zipFile = await OpenZipFileAsync())
 			{
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
@@ -444,10 +455,10 @@ private async Task<int> FetchZipIndex()
 
 		private async Task<BaseBasicProperties> GetBasicProperties()
 		{
-			using SevenZipExtractor zipFile = await OpenZipFileAsync();
+			using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 			if (zipFile is null || zipFile.ArchiveFileData is null)
 			{
-				return null;
+				throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
 			}
 
 			//zipFile.IsStreamOwner = true;
@@ -458,32 +469,29 @@ private async Task<BaseBasicProperties> GetBasicProperties()
 				: new ZipFileBasicProperties(entry);
 		}
 
-		private IAsyncOperation<SevenZipExtractor> OpenZipFileAsync()
+		private IAsyncOperation<SevenZipExtractor?> OpenZipFileAsync()
 		{
-			return AsyncInfo.Run<SevenZipExtractor>(async (cancellationToken) =>
+			return AsyncInfo.Run<SevenZipExtractor?>(async (cancellationToken) =>
 			{
 				var zipFile = await OpenZipFileAsync(FileAccessMode.Read);
-				return zipFile is not null ? new SevenZipExtractor(zipFile, Credentials.Password) : null;
+				return zipFile is not null ? new SevenZipExtractor(zipFile, Password) : null;
 			});
 		}
 
-		private IAsyncOperation<Stream> OpenZipFileAsync(FileAccessMode accessMode)
+		private IAsyncOperation<Stream?> OpenZipFileAsync(FileAccessMode accessMode)
 		{
-			return AsyncInfo.Run<Stream>(async (cancellationToken) =>
+			return AsyncInfo.Run<Stream?>(async (cancellationToken) =>
 			{
 				bool readWrite = accessMode == FileAccessMode.ReadWrite;
 				if (backingFile is not null)
 				{
-					return (await backingFile.OpenAsync(accessMode)).AsStream();
+					var stream = await backingFile.OpenAsync(accessMode);
+					return stream?.AsStream();
 				}
 				else
 				{
 					var hFile = Win32Helper.OpenFileForRead(containerPath, readWrite);
-					if (hFile.IsInvalid)
-					{
-						return null;
-					}
-					return new FileStream(hFile, readWrite ? FileAccess.ReadWrite : FileAccess.Read);
+					return hFile.IsInvalid ? null : new FileStream(hFile, readWrite ? FileAccess.ReadWrite : FileAccess.Read);
 				}
 			});
 		}
@@ -494,7 +502,7 @@ private StreamedFileDataRequestedHandler ZipDataStreamingHandler(string name)
 			{
 				try
 				{
-					using SevenZipExtractor zipFile = await OpenZipFileAsync();
+					using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 					if (zipFile is null || zipFile.ArchiveFileData is null)
 					{
 						request.FailAndClose(StreamedFileFailureMode.CurrentlyUnavailable);
diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs
index e393e758787c..3eebc217d580 100644
--- a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs
+++ b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs
@@ -4,6 +4,7 @@
 using Files.Shared.Helpers;
 using SevenZip;
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel;
@@ -19,7 +20,7 @@ namespace Files.App.Utils.Storage
 	public sealed partial class ZipStorageFolder : BaseStorageFolder, ICreateFileWithStream, IPasswordProtectedItem
 	{
 		private readonly string containerPath;
-		private BaseStorageFile backingFile;
+		private BaseStorageFile? backingFile;
 
 		public override string Path { get; }
 		public override string Name { get; }
@@ -31,9 +32,11 @@ public sealed partial class ZipStorageFolder : BaseStorageFolder, ICreateFileWit
 		public override Windows.Storage.FileAttributes Attributes => Windows.Storage.FileAttributes.Directory;
 		public override IStorageItemExtraProperties Properties => new BaseBasicStorageItemExtraProperties(this);
 
-		public StorageCredential Credentials { get; set; } = new();
+		public StorageCredential? Credentials { get; set; } = new();
+		private string Password => Credentials?.Password
+			?? throw new InvalidOperationException("Archive credentials are not available.");
 
-		public Func<IPasswordProtectedItem, Task<StorageCredential>> PasswordRequestedCallback { get; set; }
+		public Func<IPasswordProtectedItem, Task<StorageCredential>>? PasswordRequestedCallback { get; set; }
 
 		public ZipStorageFolder(string path, string containerPath)
 		{
@@ -41,7 +44,7 @@ public ZipStorageFolder(string path, string containerPath)
 			Path = path;
 			this.containerPath = containerPath;
 		}
-		public ZipStorageFolder(string path, string containerPath, BaseStorageFile backingFile) : this(path, containerPath)
+		public ZipStorageFolder(string path, string containerPath, BaseStorageFile? backingFile) : this(path, containerPath)
 			=> this.backingFile = backingFile;
 		public ZipStorageFolder(string path, string containerPath, ArchiveFileInfo entry) : this(path, containerPath)
 			=> DateCreated = entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;
@@ -53,12 +56,12 @@ public ZipStorageFolder(BaseStorageFile backingFile)
 			this.containerPath = backingFile.Path;
 			this.backingFile = backingFile;
 		}
-		public ZipStorageFolder(string path, string containerPath, ArchiveFileInfo entry, BaseStorageFile backingFile) : this(path, containerPath, entry)
+		public ZipStorageFolder(string path, string containerPath, ArchiveFileInfo entry, BaseStorageFile? backingFile) : this(path, containerPath, entry)
 			=> this.backingFile = backingFile;
 
-		public static bool IsZipPath(string path, bool includeRoot = true)
+		public static bool IsZipPath([NotNullWhen(true)] string? path, bool includeRoot = true)
 		{
-			if (!FileExtensionHelpers.IsBrowsableZipFile(path, out var ext))
+			if (path is null || !FileExtensionHelpers.IsBrowsableZipFile(path, out var ext))
 			{
 				return false;
 			}
@@ -76,7 +79,7 @@ public static bool IsZipPath(string path, bool includeRoot = true)
 		public async Task<long> GetUncompressedSize()
 		{
 			long uncompressedSize = 0;
-			using SevenZipExtractor zipFile = await FilesystemTasks.Wrap(async () =>
+			using SevenZipExtractor? zipFile = await FilesystemTasks.WrapNullable(async () =>
 			{
 				var arch = await OpenZipFileAsync();
 				return arch?.ArchiveFileData is null ? null : arch; // Force load archive (1665013614u)
@@ -112,11 +115,11 @@ public static async Task<bool> CheckDefaultZipApp(string filePath)
 			return await defaultAppDict.GetAsync(ext ?? "", queryFileAssoc);
 		}
 
-		public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
+		public static IAsyncOperation<BaseStorageFolder?> FromPathAsync(string path)
 		{
 			if (!FileExtensionHelpers.IsBrowsableZipFile(path, out var ext))
 			{
-				return Task.FromResult<BaseStorageFolder>(null).AsAsyncOperation();
+				return Task.FromResult<BaseStorageFolder?>(null).AsAsyncOperation();
 			}
 			var marker = path.IndexOf(ext, StringComparison.OrdinalIgnoreCase);
 			if (marker is not -1)
@@ -124,14 +127,14 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 				var containerPath = path.Substring(0, marker + ext.Length);
 				if (CheckAccess(containerPath))
 				{
-					return Task.FromResult((BaseStorageFolder)new ZipStorageFolder(path, containerPath)).AsAsyncOperation();
+					return Task.FromResult<BaseStorageFolder?>(new ZipStorageFolder(path, containerPath)).AsAsyncOperation();
 				}
 			}
-			return Task.FromResult<BaseStorageFolder>(null).AsAsyncOperation();
+			return Task.FromResult<BaseStorageFolder?>(null).AsAsyncOperation();
 		}
 
-		public static IAsyncOperation<BaseStorageFolder> FromStorageFileAsync(BaseStorageFile file)
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => await CheckAccess(file) ? new ZipStorageFolder(file) : null);
+		public static IAsyncOperation<BaseStorageFolder?> FromStorageFileAsync(BaseStorageFile file)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => await CheckAccess(file) ? new ZipStorageFolder(file) : null);
 
 		public override IAsyncOperation<StorageFolder> ToStorageFolderAsync() => throw new NotSupportedException();
 
@@ -140,11 +143,11 @@ public static IAsyncOperation<BaseStorageFolder> FromStorageFileAsync(BaseStorag
 
 		public override IAsyncOperation<IndexedState> GetIndexedStateAsync() => Task.FromResult(IndexedState.NotIndexed).AsAsyncOperation();
 
-		public override IAsyncOperation<BaseStorageFolder> GetParentAsync() => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> GetParentAsync() => throw new NotSupportedException();
 
 		private async Task<BaseBasicProperties> GetBasicProperties()
 		{
-			using SevenZipExtractor zipFile = await OpenZipFileAsync();
+			using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 			if (zipFile is null || zipFile.ArchiveFileData is null)
 			{
 				return new BaseBasicProperties();
@@ -168,11 +171,11 @@ public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			});
 		}
 
-		public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> GetItemAsync(string name)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IStorageItem>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IStorageItem?>(async () =>
 			{
-				using SevenZipExtractor zipFile = await OpenZipFileAsync();
+				using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
 					return null;
@@ -200,7 +203,7 @@ public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
 
-		public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
+		public override IAsyncOperation<IStorageItem?> TryGetItemAsync(string name)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -214,11 +217,11 @@ public override IAsyncOperation<IStorageItem> TryGetItemAsync(string name)
 				}
 			});
 		}
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync()
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IReadOnlyList<IStorageItem>>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<IReadOnlyList<IStorageItem>?>(async () =>
 			{
-				using SevenZipExtractor zipFile = await OpenZipFileAsync();
+				using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
 					return null;
@@ -255,47 +258,64 @@ public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
 				return items;
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
-		public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>>(async (cancellationToken)
-				=> (await GetItemsAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList()
-			);
-
-		public override IAsyncOperation<BaseStorageFile> GetFileAsync(string name)
-			=> AsyncInfo.Run<BaseStorageFile>(async (cancellationToken) => await GetItemAsync(name) as ZipStorageFile);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<ZipStorageFile>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFilesAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>>(async (cancellationToken)
-				=> (await GetFilesAsync()).Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList()
-			);
-
-		public override IAsyncOperation<BaseStorageFolder> GetFolderAsync(string name)
-			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => await GetItemAsync(name) as ZipStorageFolder);
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync()
-			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken) => (await GetItemsAsync())?.OfType<ZipStorageFolder>().ToList());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query)
-			=> AsyncInfo.Run(async (cancellationToken) => await GetFoldersAsync());
-		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
+		public override IAsyncOperation<IReadOnlyList<IStorageItem>?> GetItemsAsync(uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<IStorageItem>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
+				return items.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
+			});
+
+		public override IAsyncOperation<BaseStorageFile?> GetFileAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFile?>(async (cancellationToken) => await GetItemAsync(name) as ZipStorageFile);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
+				return items.OfType<ZipStorageFile>().ToList();
+			});
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) => await GetFilesAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFile>?> GetFilesAsync(CommonFileQuery query, uint startIndex, uint maxItemsToRetrieve)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFile>?>(async (cancellationToken) =>
+			{
+				var files = await GetFilesAsync()
+					?? throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
+				return files.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
+			});
+
+		public override IAsyncOperation<BaseStorageFolder?> GetFolderAsync(string name)
+			=> AsyncInfo.Run<BaseStorageFolder?>(async (cancellationToken) => await GetItemAsync(name) as ZipStorageFolder);
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync()
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) =>
+			{
+				var items = await GetItemsAsync()
+					?? throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
+				return items.OfType<ZipStorageFolder>().ToList();
+			});
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query)
+			=> AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) => await GetFoldersAsync());
+		public override IAsyncOperation<IReadOnlyList<BaseStorageFolder>?> GetFoldersAsync(CommonFolderQuery query, uint startIndex, uint maxItemsToRetrieve)
 		{
-			return AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>>(async (cancellationToken) =>
+			return AsyncInfo.Run<IReadOnlyList<BaseStorageFolder>?>(async (cancellationToken) =>
 			{
-				var items = await GetFoldersAsync();
+				var items = await GetFoldersAsync()
+					?? throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
 				return items.Skip((int)startIndex).Take((int)maxItemsToRetrieve).ToList();
 			});
 		}
 
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName)
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName)
 			=> CreateFileAsync(desiredName, CreationCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFile?> CreateFileAsync(string desiredName, CreationCollisionOption options)
 			=> CreateFileAsync(new MemoryStream(), desiredName, options);
 
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName)
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName)
 			=> CreateFolderAsync(desiredName, CreationCollisionOption.FailIfExists);
-		public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desiredName, CreationCollisionOption options)
+		public override IAsyncOperation<BaseStorageFolder?> CreateFolderAsync(string desiredName, CreationCollisionOption options)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFolder>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFolder?>(async () =>
 			{
 				var zipDesiredName = System.IO.Path.Combine(Path, desiredName);
 				var item = await GetItemAsync(desiredName);
@@ -310,15 +330,17 @@ public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desi
 
 				using (var ms = new MemoryStream())
 				{
-					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read)
+						?? throw new IOException($"The archive '{containerPath}' could not be opened for reading."))
 					{
 						SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 						compressor.CustomParameters.Add("cu", "on");
 						compressor.SetFormatFromExistingArchive(archiveStream);
 						var fileName = IO.Path.GetRelativePath(containerPath, zipDesiredName);
-						await compressor.CompressStreamDictionaryAsync(archiveStream, new Dictionary<string, Stream>() { { fileName, null } }, Credentials.Password, ms);
+						await compressor.CompressStreamDictionaryAsync(archiveStream, new Dictionary<string, Stream?>() { { fileName, null } }, Password, ms);
 					}
-					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite)
+						?? throw new IOException($"The archive '{containerPath}' could not be opened for writing."))
 					{
 						ms.Position = 0;
 						await ms.CopyToAsync(archiveStream);
@@ -333,8 +355,8 @@ public override IAsyncOperation<BaseStorageFolder> CreateFolderAsync(string desi
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
 		}
 
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
-		public override IAsyncOperation<BaseStorageFolder> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder) => throw new NotSupportedException();
+		public override IAsyncOperation<BaseStorageFolder?> MoveAsync(IStorageFolder destinationFolder, NameCollisionOption option) => throw new NotSupportedException();
 
 		public override IAsyncAction RenameAsync(string desiredName) => RenameAsync(desiredName, NameCollisionOption.FailIfExists);
 		public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption option)
@@ -349,31 +371,37 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 					}
 					else
 					{
-						var fileName = IO.Path.Combine(IO.Path.GetDirectoryName(Path), desiredName);
+						var parentPath = IO.Path.GetDirectoryName(Path) ?? throw new InvalidOperationException("The archive path has no parent.");
+						var fileName = IO.Path.Combine(parentPath, desiredName);
 						PInvoke.MoveFileFromApp(Path, fileName);
 					}
 				}
 				else
 				{
-					var index = await FetchZipIndex();
+					var index = await FetchZipIndex()
+						?? throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
 					if (index.IsEmpty())
 					{
 						return;
 					}
 					using (var ms = new MemoryStream())
 					{
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for reading."))
 						{
 							SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 							compressor.CustomParameters.Add("cu", "on");
 							compressor.SetFormatFromExistingArchive(archiveStream);
 							var folderKey = IO.Path.GetRelativePath(containerPath, Path);
-							var folderDes = IO.Path.Combine(IO.Path.GetDirectoryName(folderKey), desiredName);
+							var parentPath = IO.Path.GetDirectoryName(folderKey)
+								?? throw new InvalidOperationException("The archive entry has no parent.");
+							var folderDes = IO.Path.Combine(parentPath, desiredName);
 							var entriesMap = new Dictionary<int, string>(index.Select(x => new KeyValuePair<int, string>(x.Index,
 								IO.Path.Combine(folderDes, IO.Path.GetRelativePath(folderKey, x.Key)))));
-							await compressor.ModifyArchiveAsync(archiveStream, entriesMap, Credentials.Password, ms);
+							await compressor.ModifyArchiveAsync(archiveStream, entriesMap, Password, ms);
 						}
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for writing."))
 						{
 							ms.Position = 0;
 							await ms.CopyToAsync(archiveStream);
@@ -407,22 +435,25 @@ public override IAsyncAction DeleteAsync(StorageDeleteOption option)
 				}
 				else
 				{
-					var index = await FetchZipIndex();
+					var index = await FetchZipIndex()
+						?? throw new InvalidDataException($"The archive '{containerPath}' could not be read.");
 					if (index.IsEmpty())
 					{
 						return;
 					}
 					using (var ms = new MemoryStream())
 					{
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for reading."))
 						{
 							SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 							compressor.CustomParameters.Add("cu", "on");
 							compressor.SetFormatFromExistingArchive(archiveStream);
-							var entriesMap = new Dictionary<int, string>(index.Select(x => new KeyValuePair<int, string>(x.Index, null)));
-							await compressor.ModifyArchiveAsync(archiveStream, entriesMap, Credentials.Password, ms);
+							var entriesMap = new Dictionary<int, string?>(index.Select(x => new KeyValuePair<int, string?>(x.Index, null)));
+							await compressor.ModifyArchiveAsync(archiveStream, entriesMap, Password, ms);
 						}
-						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite)
+							?? throw new IOException($"The archive '{containerPath}' could not be opened for writing."))
 						{
 							ms.Position = 0;
 							await ms.CopyToAsync(archiveStream);
@@ -449,7 +480,7 @@ public override IAsyncAction DeleteAsync(StorageDeleteOption option)
 		public override StorageFolderQueryResult CreateFolderQuery(CommonFolderQuery query) => throw new NotSupportedException();
 		public override BaseStorageFolderQueryResult CreateFolderQueryWithOptions(QueryOptions queryOptions) => new(this, queryOptions);
 
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -461,7 +492,7 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 				return await zipFile.GetThumbnailAsync(mode);
 			});
 		}
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -473,7 +504,7 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 				return await zipFile.GetThumbnailAsync(mode, requestedSize);
 			});
 		}
-		public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
+		public override IAsyncOperation<StorageItemThumbnail?> GetThumbnailAsync(ThumbnailMode mode, uint requestedSize, ThumbnailOptions options)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
@@ -522,7 +553,8 @@ private static async Task<bool> CheckAccess(BaseStorageFile file)
 		{
 			return await SafetyExtensions.IgnoreExceptions(async () =>
 			{
-				using var stream = await file.OpenReadAsync();
+				using var stream = await file.OpenReadAsync()
+					?? throw new IOException("The archive could not be opened for reading.");
 				return CheckAccess(stream.AsStream());
 			});
 		}
@@ -567,7 +599,7 @@ public async Task<bool> ValidateCredentialsAsync()
 		{
 			try
 			{
-				using SevenZipExtractor zipFile = await OpenZipFileAsync();
+				using SevenZipExtractor? zipFile = await OpenZipFileAsync();
 				return zipFile?.ArchiveFileData is not null;
 			}
 			catch (Exception) // SevenZipOpenFailedException(WrongPassword) for bad credentials; IO exceptions (e.g. archive deleted meanwhile) equally mean the credentials can't be verified
@@ -576,39 +608,36 @@ public async Task<bool> ValidateCredentialsAsync()
 			}
 		}
 
-		private IAsyncOperation<SevenZipExtractor> OpenZipFileAsync()
+		private IAsyncOperation<SevenZipExtractor?> OpenZipFileAsync()
 		{
-			return AsyncInfo.Run<SevenZipExtractor>(async (cancellationToken) =>
+			return AsyncInfo.Run<SevenZipExtractor?>(async (cancellationToken) =>
 			{
 				var zipFile = await OpenZipFileAsync(FileAccessMode.Read);
-				return zipFile is not null ? new SevenZipExtractor(zipFile, Credentials.Password) : null;
+				return zipFile is not null ? new SevenZipExtractor(zipFile, Password) : null;
 			});
 		}
 
-		private IAsyncOperation<Stream> OpenZipFileAsync(FileAccessMode accessMode)
+		private IAsyncOperation<Stream?> OpenZipFileAsync(FileAccessMode accessMode)
 		{
-			return AsyncInfo.Run(async (cancellationToken) =>
+			return AsyncInfo.Run<Stream?>(async (cancellationToken) =>
 			{
 				bool readWrite = accessMode is FileAccessMode.ReadWrite;
 				if (backingFile is not null)
 				{
-					return (await backingFile.OpenAsync(accessMode)).AsStream();
+					var stream = await backingFile.OpenAsync(accessMode);
+					return stream?.AsStream();
 				}
 				else
 				{
 					var hFile = Win32Helper.OpenFileForRead(containerPath, readWrite);
-					if (hFile.IsInvalid)
-					{
-						return null;
-					}
-					return new FileStream(hFile, readWrite ? FileAccess.ReadWrite : FileAccess.Read);
+					return hFile.IsInvalid ? null : new FileStream(hFile, readWrite ? FileAccess.ReadWrite : FileAccess.Read);
 				}
 			});
 		}
 
-		private async Task<IEnumerable<(int Index, string Key)>> FetchZipIndex()
+		private async Task<IEnumerable<(int Index, string Key)>?> FetchZipIndex()
 		{
-			using (SevenZipExtractor zipFile = await OpenZipFileAsync())
+			using (SevenZipExtractor? zipFile = await OpenZipFileAsync())
 			{
 				if (zipFile is null || zipFile.ArchiveFileData is null)
 				{
@@ -619,12 +648,12 @@ private IAsyncOperation<Stream> OpenZipFileAsync(FileAccessMode accessMode)
 			}
 		}
 
-		public IAsyncOperation<BaseStorageFile> CreateFileAsync(Stream contents, string desiredName)
+		public IAsyncOperation<BaseStorageFile?> CreateFileAsync(Stream contents, string desiredName)
 			=> CreateFileAsync(new MemoryStream(), desiredName, CreationCollisionOption.FailIfExists);
 
-		public IAsyncOperation<BaseStorageFile> CreateFileAsync(Stream contents, string desiredName, CreationCollisionOption options)
+		public IAsyncOperation<BaseStorageFile?> CreateFileAsync(Stream contents, string desiredName, CreationCollisionOption options)
 		{
-			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile>(async () =>
+			return AsyncInfo.Run((cancellationToken) => SafetyExtensions.Wrap<BaseStorageFile?>(async () =>
 			{
 				var zipDesiredName = System.IO.Path.Combine(Path, desiredName);
 				var item = await GetItemAsync(desiredName);
@@ -639,15 +668,17 @@ public IAsyncOperation<BaseStorageFile> CreateFileAsync(Stream contents, string
 
 				using (var ms = new MemoryStream())
 				{
-					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read)
+						?? throw new IOException($"The archive '{containerPath}' could not be opened for reading."))
 					{
 						SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 						compressor.CustomParameters.Add("cu", "on");
 						compressor.SetFormatFromExistingArchive(archiveStream);
 						var fileName = IO.Path.GetRelativePath(containerPath, zipDesiredName);
-						await compressor.CompressStreamDictionaryAsync(archiveStream, new Dictionary<string, Stream>() { { fileName, contents } }, Credentials.Password, ms);
+						await compressor.CompressStreamDictionaryAsync(archiveStream, new Dictionary<string, Stream>() { { fileName, contents } }, Password, ms);
 					}
-					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+					await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite)
+						?? throw new IOException($"The archive '{containerPath}' could not be opened for writing."))
 					{
 						ms.Position = 0;
 						await ms.CopyToAsync(archiveStream);
diff --git a/src/Files.App/Utils/Taskbar/SystemTrayIconWindow.cs b/src/Files.App/Utils/Taskbar/SystemTrayIconWindow.cs
index a8256c52dacd..20d8167b75e8 100644
--- a/src/Files.App/Utils/Taskbar/SystemTrayIconWindow.cs
+++ b/src/Files.App/Utils/Taskbar/SystemTrayIconWindow.cs
@@ -16,7 +16,7 @@ namespace Files.App.Utils.Taskbar
 	/// </summary>
 	public sealed partial class SystemTrayIconWindow : IDisposable
 	{
-		private SystemTrayIcon _trayIcon;
+		private SystemTrayIcon? _trayIcon;
 
 		private readonly WNDPROC _windowProcedure;
 
@@ -69,7 +69,7 @@ public unsafe SystemTrayIconWindow(SystemTrayIcon icon)
 
 		private LRESULT WindowProc(HWND hWnd, uint uMsg, WPARAM wParam, LPARAM lParam)
 		{
-			return _trayIcon.WindowProc(hWnd, uMsg, wParam, lParam);
+			return _trayIcon!.WindowProc(hWnd, uMsg, wParam, lParam);
 		}
 
 		public void Dispose()
diff --git a/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs
index 339d0824ce73..48c245d83fc4 100644
--- a/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs
@@ -49,7 +49,7 @@ private async Task DoCommitRenameAsync()
 			{
 				var itemType = item.PrimaryItemAttribute == StorageItemTypes.Folder ? FilesystemItemType.Directory : FilesystemItemType.File;
 				await context.ShellPage.FilesystemHelpers.RenameAsync(
-					StorageHelpers.FromPathAndType(item.ItemPath, itemType),
+					StorageHelpers.FromPathAndType(item.GetRequiredPath(), itemType),
 					FileName + item.FileExtension,
 					NameCollisionOption.GenerateUniqueName,
 					true,
@@ -60,4 +60,4 @@ await context.ShellPage.FilesystemHelpers.RenameAsync(
 		}
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/ViewModels/Dialogs/CreateShortcutDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/CreateShortcutDialogViewModel.cs
index 472378bf74dc..0ff0c62aed45 100644
--- a/src/Files.App/ViewModels/Dialogs/CreateShortcutDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/CreateShortcutDialogViewModel.cs
@@ -28,16 +28,16 @@ public sealed partial class CreateShortcutDialogViewModel : ObservableObject
 		public string ShortcutCompleteName { get; private set; } = string.Empty;
 
 		// Full path of the destination item
-		public string FullPath { get; private set; }
+		public string? FullPath { get; private set; }
 
 		// Arguments to be passed to the destination item if it's an executable
-		public string Arguments { get; private set; }
+		public string? Arguments { get; private set; }
 
 		// Previous path of the destination item
-		private string _previousShortcutTargetPath;
+		private string? _previousShortcutTargetPath;
 
-		private string _shortcutName;
-		public string ShortcutName
+		private string? _shortcutName;
+		public string? ShortcutName
 		{
 			get => _shortcutName;
 			set
@@ -205,7 +205,8 @@ public bool IsLocationValid
 
 		public bool ShowWarningTip => !string.IsNullOrEmpty(ShortcutTarget) && !_isLocationValid;
 
-		public bool ShowNameWarningTip => !string.IsNullOrEmpty(_shortcutTarget) && !FilesystemHelpers.IsValidForFilename(_shortcutName);
+		public bool ShowNameWarningTip => !string.IsNullOrEmpty(_shortcutTarget) && !FilesystemHelpers.IsValidForFilename(
+			_shortcutName ?? throw new InvalidOperationException("The shortcut name has not been set."));
 
 		public bool IsShortcutValid => _isLocationValid && !ShowNameWarningTip && !string.IsNullOrEmpty(_shortcutTarget);
 
@@ -242,7 +243,7 @@ private unsafe Task SelectDestination()
 			{
 				bi.pszDisplayName = displayNameBuffer;
 				bi.lpszTitle = title;
-				var pidl = PInvoke.SHBrowseForFolder(ref bi);
+				var pidl = PInvoke.SHBrowseForFolder(in bi);
 				if (pidl is not null)
 				{
 					Span<char> path = stackalloc char[260];
@@ -292,7 +293,8 @@ private void AutoFillName()
 					if (string.IsNullOrEmpty(FullPath))
 					{
 
-						var destinationPath = FullPath.Replace('/', '\\');
+						var destinationPath = (FullPath
+							?? throw new InvalidOperationException("The shortcut target path has not been set.")).Replace('/', '\\');
 
 						if (destinationPath.EndsWith('\\'))
 							destinationPath = destinationPath.Substring(0, destinationPath.Length - 1);
diff --git a/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs
index 9be6bc53f979..44db93a866a4 100644
--- a/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs
@@ -18,7 +18,7 @@ public sealed partial class DecompressArchiveDialogViewModel : ObservableObject
 		private readonly IStorageFile archive;
 
 		// Properties
-		public BaseStorageFolder DestinationFolder { get; private set; }
+		public BaseStorageFolder? DestinationFolder { get; private set; }
 
 		private string destinationFolderPath;
 		public string DestinationFolderPath
@@ -42,7 +42,7 @@ public bool IsDestinationPathValid
 					if (string.IsNullOrWhiteSpace(DestinationFolderPath))
 						return false;
 
-					string parentDir = Path.GetDirectoryName(DestinationFolderPath);
+					string? parentDir = Path.GetDirectoryName(DestinationFolderPath);
 					string finalSegment = Path.GetFileName(DestinationFolderPath);
 
 					// Check parent directory exists
@@ -113,7 +113,7 @@ public bool ShowPathSelection
 		// Commands
 		public IRelayCommand PrimaryButtonClickCommand { get; private set; }
 		public ICommand SelectDestinationCommand { get; private set; }
-		public ICommand QuerySubmittedCommand { get; private set; }
+		public ICommand? QuerySubmittedCommand { get; private set; }
 
 		// Constructor
 		public DecompressArchiveDialogViewModel(IStorageFile archive)
@@ -160,7 +160,7 @@ private void RefreshEncodingOptions()
 			{
 				EncodingOptions = EncodingItem.Defaults;
 			}
-			SelectedEncoding = EncodingOptions.FirstOrDefault();
+			SelectedEncoding = EncodingOptions[0];
 		}
 
 		// Public Methods
@@ -183,4 +183,4 @@ public void UpdateSuggestions(string query)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/ViewModels/Dialogs/DynamicDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/DynamicDialogViewModel.cs
index bd9ff746ffd1..97b9839120c6 100644
--- a/src/Files.App/ViewModels/Dialogs/DynamicDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/DynamicDialogViewModel.cs
@@ -16,14 +16,14 @@ public sealed partial class DynamicDialogViewModel : ObservableObject, IDisposab
 		/// <summary>
 		/// Stores any additional data that could be written to, read from.
 		/// </summary>
-		public object AdditionalData { get; set; }
+		public object? AdditionalData { get; set; }
 
-		public object displayControl;
+		public object? displayControl;
 
 		/// <summary>
 		/// The control that is dynamically displayed.
 		/// </summary>
-		public object DisplayControl
+		public object? DisplayControl
 		{
 			get => displayControl;
 			set
@@ -96,25 +96,25 @@ public DynamicDialogButtons DynamicButtons
 			}
 		}
 
-		private string titleText;
+		private string? titleText;
 
 		/// <summary>
 		/// The Title text of the dialog.
 		/// </summary>
-		public string TitleText
+		public string? TitleText
 		{
 			get => titleText;
 			set => SetProperty(ref titleText, value);
 		}
 
-		private string subtitleText;
+		private string? subtitleText;
 
 		/// <summary>
 		/// The subtitle of the dialog.
 		/// <br/>
 		/// (Can be null or empty)
 		/// </summary>
-		public string SubtitleText
+		public string? SubtitleText
 		{
 			get => subtitleText;
 			set
@@ -139,12 +139,12 @@ public bool SubtitleLoad
 
 		#region Primary Button
 
-		private string primaryButtonText;
+		private string? primaryButtonText;
 
 		/// <summary>
 		/// The text content of the primary button.
 		/// </summary>
-		public string PrimaryButtonText
+		public string? PrimaryButtonText
 		{
 			get => primaryButtonText;
 			set => SetProperty(ref primaryButtonText, value);
@@ -165,12 +165,12 @@ public bool IsPrimaryButtonEnabled
 
 		#region Secondary Button
 
-		private string secondaryButtonText;
+		private string? secondaryButtonText;
 
 		/// <summary>
 		/// The text of the secondary button.
 		/// </summary>
-		public string SecondaryButtonText
+		public string? SecondaryButtonText
 		{
 			get => secondaryButtonText;
 			set => SetProperty(ref secondaryButtonText, value);
@@ -191,12 +191,12 @@ public bool IsSecondaryButtonEnabled
 
 		#region Close Button
 
-		private string closeButtonText;
+		private string? closeButtonText;
 
 		/// <summary>
 		/// The text of the close button.
 		/// </summary>
-		public string CloseButtonText
+		public string? CloseButtonText
 		{
 			get => closeButtonText;
 			set => SetProperty(ref closeButtonText, value);
@@ -259,14 +259,18 @@ public DynamicDialogButtons DynamicButtonsEnabled
 		/// <br/>
 		/// This action is assigned by default.
 		/// </summary>
-		public Action HideDialog { get; set; }
+		public Action? HideDialog { get; set; }
 
-		private Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> primaryButtonAction;
+		internal void Hide()
+			=> (HideDialog
+				?? throw new InvalidOperationException("The dialog has not been attached to a view."))();
+
+		private Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs>? primaryButtonAction;
 
 		/// <summary>
 		/// OnPrimary action.
 		/// </summary>
-		public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> PrimaryButtonAction
+		public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs>? PrimaryButtonAction
 		{
 			get => primaryButtonAction;
 			set
@@ -275,19 +279,22 @@ public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> Primary
 				{
 					PrimaryButtonCommand = new RelayCommand<ContentDialogButtonClickEventArgs>((e) =>
 					{
+						var action = PrimaryButtonAction
+							?? throw new InvalidOperationException("The primary button action has not been configured.");
+						var eventArgs = e ?? throw new ArgumentNullException(nameof(e));
 						DynamicResult = DynamicDialogResult.Primary;
-						PrimaryButtonAction(this, e);
+						action(this, eventArgs);
 					});
 				}
 			}
 		}
 
-		private Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> secondaryButtonAction;
+		private Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs>? secondaryButtonAction;
 
 		/// <summary>
 		/// OnSecondary action.
 		/// </summary>
-		public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> SecondaryButtonAction
+		public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs>? SecondaryButtonAction
 		{
 			get => secondaryButtonAction;
 			set
@@ -296,19 +303,22 @@ public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> Seconda
 				{
 					SecondaryButtonCommand = new RelayCommand<ContentDialogButtonClickEventArgs>((e) =>
 					{
+						var action = SecondaryButtonAction
+							?? throw new InvalidOperationException("The secondary button action has not been configured.");
+						var eventArgs = e ?? throw new ArgumentNullException(nameof(e));
 						DynamicResult = DynamicDialogResult.Secondary;
-						SecondaryButtonAction(this, e);
+						action(this, eventArgs);
 					});
 				}
 			}
 		}
 
-		private Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> closeButtonAction;
+		private Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs>? closeButtonAction;
 
 		/// <summary>
 		/// OnClose action.
 		/// </summary>
-		public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> CloseButtonAction
+		public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs>? CloseButtonAction
 		{
 			get => closeButtonAction;
 			set
@@ -317,14 +327,17 @@ public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> CloseBu
 				{
 					CloseButtonCommand = new RelayCommand<ContentDialogButtonClickEventArgs>((e) =>
 					{
+						var action = CloseButtonAction
+							?? throw new InvalidOperationException("The close button action has not been configured.");
+						var eventArgs = e ?? throw new ArgumentNullException(nameof(e));
 						DynamicResult = DynamicDialogResult.Cancel;
-						CloseButtonAction(this, e);
+						action(this, eventArgs);
 					});
 				}
 			}
 		}
 
-		private Action<DynamicDialogViewModel, KeyRoutedEventArgs> keyDownAction;
+		private Action<DynamicDialogViewModel, KeyRoutedEventArgs>? keyDownAction;
 
 		/// <summary>
 		/// The keydown action on the dialog.
@@ -334,7 +347,7 @@ public Action<DynamicDialogViewModel, ContentDialogButtonClickEventArgs> CloseBu
 		/// <br/>
 		/// This action is assigned by default.
 		/// </summary>
-		public Action<DynamicDialogViewModel, KeyRoutedEventArgs> KeyDownAction
+		public Action<DynamicDialogViewModel, KeyRoutedEventArgs>? KeyDownAction
 		{
 			get => keyDownAction;
 			set
@@ -343,25 +356,30 @@ public Action<DynamicDialogViewModel, KeyRoutedEventArgs> KeyDownAction
 				{
 					KeyDownCommand = new RelayCommand<KeyRoutedEventArgs>((e) =>
 					{
+						var action = KeyDownAction
+							?? throw new InvalidOperationException("The key-down action has not been configured.");
+						var eventArgs = e ?? throw new ArgumentNullException(nameof(e));
 						DynamicResult = DynamicDialogResult.Cancel;
-						KeyDownAction(this, e);
+						action(this, eventArgs);
 					});
 				}
 			}
 		}
 
-		private Action<DynamicDialogViewModel, RoutedEventArgs> displayControlOnLoaded;
+		private Action<DynamicDialogViewModel, RoutedEventArgs?>? displayControlOnLoaded;
 
-		public Action<DynamicDialogViewModel, RoutedEventArgs> DisplayControlOnLoaded
+		public Action<DynamicDialogViewModel, RoutedEventArgs?>? DisplayControlOnLoaded
 		{
 			get => displayControlOnLoaded;
 			set
 			{
 				if (SetProperty(ref displayControlOnLoaded, value))
 				{
-					DisplayControlOnLoadedCommand = new RelayCommand<RoutedEventArgs>((e) =>
+					DisplayControlOnLoadedCommand = new RelayCommand<RoutedEventArgs?>((e) =>
 					{
-						DisplayControlOnLoaded(this, e);
+						var action = DisplayControlOnLoaded
+							?? throw new InvalidOperationException("The loaded action has not been configured.");
+						action(this, e);
 					});
 				}
 			}
@@ -371,15 +389,15 @@ public Action<DynamicDialogViewModel, RoutedEventArgs> DisplayControlOnLoaded
 
 		#region Commands
 
-		public ICommand PrimaryButtonCommand { get; private set; }
+		public ICommand? PrimaryButtonCommand { get; private set; }
 
-		public ICommand SecondaryButtonCommand { get; private set; }
+		public ICommand? SecondaryButtonCommand { get; private set; }
 
-		public ICommand CloseButtonCommand { get; private set; }
+		public ICommand? CloseButtonCommand { get; private set; }
 
-		public ICommand KeyDownCommand { get; private set; }
+		public ICommand? KeyDownCommand { get; private set; }
 
-		public ICommand DisplayControlOnLoadedCommand { get; private set; }
+		public ICommand? DisplayControlOnLoadedCommand { get; private set; }
 
 		#endregion Commands
 
@@ -390,15 +408,13 @@ public DynamicDialogViewModel()
 			// Create default implementation
 			TitleText = "DynamicDialog";
 			PrimaryButtonText = "Ok";
-			PrimaryButtonAction = (vm, e) => HideDialog();
-			SecondaryButtonAction = (vm, e) => HideDialog();
-			CloseButtonAction = (vm, e) => HideDialog();
+			PrimaryButtonAction = (vm, e) => vm.Hide();
+			SecondaryButtonAction = (vm, e) => vm.Hide();
+			CloseButtonAction = (vm, e) => vm.Hide();
 			KeyDownAction = (vm, e) =>
 			{
 				if (e.Key == VirtualKey.Escape)
-				{
-					HideDialog();
-				}
+					vm.Hide();
 			};
 			DisplayControlOnLoaded = (vm, e) =>
 			{
@@ -406,7 +422,7 @@ public DynamicDialogViewModel()
 				if (vm.DisplayControl is not DependencyObject displayControl)
 					return;
 
-				Control control = (displayControl as Control) ?? DependencyObjectHelpers.FindChild<Control>(displayControl);
+				Control? control = (displayControl as Control) ?? DependencyObjectHelpers.FindChild<Control>(displayControl);
 				control?.Focus(FocusState.Programmatic);
 			};
 
diff --git a/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogConflictItemViewModel.cs b/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogConflictItemViewModel.cs
index a73f44352f73..5e7718865b5e 100644
--- a/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogConflictItemViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogConflictItemViewModel.cs
@@ -23,7 +23,11 @@ public string? CustomName
 				if (SetProperty(ref _CustomName, value))
 				{
 					DestinationDisplayName = value;
-					_DestinationPath = Path.Combine(Path.GetDirectoryName(DestinationPath), value);
+					var destinationPath = DestinationPath ?? throw new ArgumentNullException(nameof(DestinationPath));
+					var customName = value ?? throw new ArgumentNullException(nameof(value));
+					var destinationDirectory = Path.GetDirectoryName(destinationPath)
+						?? throw new InvalidOperationException("The destination path does not have a parent directory.");
+					_DestinationPath = Path.Combine(destinationDirectory, customName);
 				}
 			}
 		}
@@ -46,7 +50,7 @@ public bool IsTextBoxVisible
 			set => SetProperty(ref _IsTextBoxVisible, value);
 		}
 
-		public string DestinationDirectoryDisplayName
+		public string? DestinationDirectoryDisplayName
 			=> Path.GetFileName(Path.GetDirectoryName(DestinationPath));
 
 		public bool IsConflict
diff --git a/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs
index da7e88e3d0de..cf4f81ebaa76 100644
--- a/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs
@@ -216,7 +216,7 @@ public static FileSystemDialogViewModel GetDialogViewModel(FileSystemDialogMode
 			return viewModel;
 		}
 
-		public static FileSystemDialogViewModel GetDialogViewModel(List<BaseFileSystemDialogItemViewModel> nonConflictingItems, string titleText, string descriptionText, string primaryButtonText, string secondaryButtonText, string closeButtonText = null)
+		public static FileSystemDialogViewModel GetDialogViewModel(List<BaseFileSystemDialogItemViewModel> nonConflictingItems, string titleText, string? descriptionText, string? primaryButtonText, string? secondaryButtonText, string? closeButtonText = null)
 		{
 			var viewModel = new FileSystemDialogViewModel(
 				new()
diff --git a/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
index f4f90ffc4ba1..5a91644e8658 100644
--- a/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
@@ -24,7 +24,7 @@ public ReorderSidebarItemsDialogViewModel()
 
 		public void SaveChanges()
 		{
-			quickAccessService.SaveAsync(SidebarPinnedFolderItems.Select(x => x.Path).ToArray());
+			quickAccessService.SaveAsync(SidebarPinnedFolderItems.Select(x => x.Path!).ToArray());
 		}
 	}
 }
diff --git a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
index ceab728663dd..ea201e24af75 100644
--- a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
+++ b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
@@ -42,37 +42,48 @@ public BaseLayoutViewModel(IShellPage associatedInstance, ItemManipulationModel
 			_associatedInstance = associatedInstance;
 			_itemManipulationModel = itemManipulationModel;
 
-			CreateNewFileCommand = new RelayCommand<ShellNewEntry>(CreateNewFile);
+			CreateNewFileCommand = new RelayCommand<ShellNewEntry?>(CreateNewFile);
 			ItemPointerPressedCommand = new AsyncRelayCommand<PointerRoutedEventArgs>(ItemPointerPressedAsync);
 			PointerWheelChangedCommand = new RelayCommand<PointerRoutedEventArgs>(PointerWheelChanged);
 			DragOverCommand = new AsyncRelayCommand<DragEventArgs>(DragOverAsync);
 			DropCommand = new AsyncRelayCommand<DragEventArgs>(DropAsync);
 		}
 
-		private void CreateNewFile(ShellNewEntry f)
+		private void CreateNewFile(ShellNewEntry? f)
 		{
 			_ = UIFilesystemHelpers.CreateFileFromDialogResultTypeAsync(AddItemDialogItemType.File, f, _associatedInstance);
 		}
 
-		private async Task ItemPointerPressedAsync(PointerRoutedEventArgs e)
+		private async Task ItemPointerPressedAsync(PointerRoutedEventArgs? e)
 		{
+			if (e is null)
+				return;
+
 			// If a folder item was clicked, disable middle mouse click to scroll to cancel the mouse scrolling state and re-enable it
 			if (e.GetCurrentPoint(null).Properties.IsMiddleButtonPressed &&
 				e.OriginalSource is FrameworkElement { DataContext: ListedItem Item } &&
 				Item.PrimaryItemAttribute == StorageItemTypes.Folder)
 			{
-				_associatedInstance.SlimContentPage.IsMiddleClickToScrollEnabled = false;
-				_associatedInstance.SlimContentPage.IsMiddleClickToScrollEnabled = true;
+				var contentPage = _associatedInstance.SlimContentPage
+					?? throw new InvalidOperationException("The shell page does not have an active content page.");
+				contentPage.IsMiddleClickToScrollEnabled = false;
+				contentPage.IsMiddleClickToScrollEnabled = true;
 
 				if (Item.IsShortcut)
-					await NavigationHelpers.OpenPathInNewTab(((e.OriginalSource as FrameworkElement)?.DataContext as IShortcutItem)?.TargetPath ?? Item.ItemPath);
+				{
+					var targetPath = ((e.OriginalSource as FrameworkElement)?.DataContext as IShortcutItem)?.TargetPath;
+					await NavigationHelpers.OpenPathInNewTab(!string.IsNullOrEmpty(targetPath) ? targetPath : Item.GetRequiredPath());
+				}
 				else
 					await NavigationHelpers.OpenPathInNewTab(Item.ItemPath);
 			}
 		}
 
-		private void PointerWheelChanged(PointerRoutedEventArgs e)
+		private void PointerWheelChanged(PointerRoutedEventArgs? e)
 		{
+			if (e is null)
+				return;
+
 			if (e.KeyModifiers is VirtualKeyModifiers.Control &&
 				_associatedInstance.IsCurrentInstance)
 			{
@@ -89,8 +100,11 @@ private void PointerWheelChanged(PointerRoutedEventArgs e)
 			}
 		}
 
-		public async Task DragOverAsync(DragEventArgs e)
+		public async Task DragOverAsync(DragEventArgs? e)
 		{
+			if (e is null)
+				return;
+
 			var deferral = e.GetDeferral();
 
 			if (_associatedInstance.InstanceViewModel.IsPageTypeSearchResults)
@@ -113,7 +127,9 @@ public async Task DragOverAsync(DragEventArgs e)
 			{
 				e.Handled = true;
 
-				var workingDirectory = _associatedInstance.ShellViewModel.WorkingDirectory.TrimPath();
+				var workingDirectoryPath = _associatedInstance.ShellViewModel.WorkingDirectory
+					?? throw new InvalidOperationException("The shell page does not have a working directory.");
+				var workingDirectory = workingDirectoryPath.TrimPath()!;
 				var folderName = Path.IsPathRooted(workingDirectory) && Path.GetPathRoot(workingDirectory) == workingDirectory ? Path.GetPathRoot(workingDirectory) : Path.GetFileName(workingDirectory);
 
 				if (e.DataView.Contains(StandardDataFormats.Uri) && await e.DataView.GetUriAsync() is { } uri)
@@ -131,7 +147,7 @@ public async Task DragOverAsync(DragEventArgs e)
 				var draggedItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView);
 
 				// As long as one file doesn't already belong to this folder
-				if (_associatedInstance.InstanceViewModel.IsPageTypeSearchResults || draggedItems.Any() && draggedItems.AreItemsAlreadyInFolder(_associatedInstance.ShellViewModel.WorkingDirectory))
+				if (_associatedInstance.InstanceViewModel.IsPageTypeSearchResults || draggedItems.Any() && draggedItems.AreItemsAlreadyInFolder(workingDirectoryPath))
 				{
 					e.AcceptedOperation = DataPackageOperation.None;
 				}
@@ -179,7 +195,7 @@ x.Item is ZipStorageFile ||
 							e.DragUIOverride.Caption = string.Format(Strings.CopyToFolderCaptionText.GetLocalizedResource(), folderName);
 							e.AcceptedOperation = DataPackageOperation.Copy;
 						}
-						else if (draggedItems.AreItemsInSameDrive(_associatedInstance.ShellViewModel.WorkingDirectory))
+						else if (draggedItems.AreItemsInSameDrive(workingDirectoryPath))
 						{
 							e.DragUIOverride.Caption = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), folderName);
 							// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
@@ -203,7 +219,7 @@ x.Item is ZipStorageFile ||
 			deferral.Complete();
 		}
 
-		public async Task DropAsync(DragEventArgs e)
+		public async Task DropAsync(DragEventArgs? e)
 		{
 			if (e is null)
 				return;
@@ -236,24 +252,26 @@ public async Task DropAsync(DragEventArgs e)
 			{
 				if (!FilesystemHelpers.HasDraggedStorageItems(e.DataView))
 					return;
+				var workingDirectoryPath = _associatedInstance.ShellViewModel.WorkingDirectory
+					?? throw new InvalidOperationException("The shell page does not have a working directory.");
 
 				if (e.DataView.Properties.TryGetValue("Files_ActionBinder", out var actionBinder) && actionBinder is "Files_ShelfBinder")
 				{
 					if (e.OriginalSource is not UIElement uiElement)
 						return;
 
-					var pwd = _associatedInstance.ShellViewModel.WorkingDirectory.TrimPath();
+					var pwd = workingDirectoryPath.TrimPath();
 					var folderName = Path.IsPathRooted(pwd) && Path.GetPathRoot(pwd) == pwd ? Path.GetPathRoot(pwd) : Path.GetFileName(pwd);
 					var menuFlyout = new MenuFlyout()
 					{
 						Items =
 						{
 							new MenuFlyoutItem() { Text = string.Format(Strings.CopyToFolderCaptionText.GetLocalizedResource(), folderName), Command = new AsyncRelayCommand(async ct =>
-								await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation.Copy, e.DataView, _associatedInstance.ShellViewModel.WorkingDirectory, false, true)) },
+								await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation.Copy, e.DataView, workingDirectoryPath, false, true)) },
 							new MenuFlyoutItem() { Text = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), folderName), Command = new AsyncRelayCommand(async ct =>
-								await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation.Move, e.DataView, _associatedInstance.ShellViewModel.WorkingDirectory, false, true)) },
+								await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation.Move, e.DataView, workingDirectoryPath, false, true)) },
 							new MenuFlyoutItem() { Text = string.Format(Strings.LinkToFolderCaptionText.GetLocalizedResource(), folderName), Command = new AsyncRelayCommand(async ct =>
-								await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation.Link, e.DataView, _associatedInstance.ShellViewModel.WorkingDirectory, false, true)) }
+								await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation.Link, e.DataView, workingDirectoryPath, false, true)) }
 						}
 					};
 
@@ -261,7 +279,7 @@ await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(DataPackag
 				}
 				else
 				{
-					await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, _associatedInstance.ShellViewModel.WorkingDirectory, false, true);
+					await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, workingDirectoryPath, false, true);
 					await _associatedInstance.RefreshIfNoWatcherExistsAsync();
 				}
 			}
@@ -275,4 +293,4 @@ public void Dispose()
 		{
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/ViewModels/MainPageViewModel.cs b/src/Files.App/ViewModels/MainPageViewModel.cs
index 5fddd8d7d141..a0dfe73b1bfe 100644
--- a/src/Files.App/ViewModels/MainPageViewModel.cs
+++ b/src/Files.App/ViewModels/MainPageViewModel.cs
@@ -389,7 +389,10 @@ private async Task ExecuteOpenNetworkSharingSettingsCommand()
 
 		private async void ExecuteNavigateToNumberedTabKeyboardAcceleratorCommand(KeyboardAcceleratorInvokedEventArgs? e)
 		{
-			var indexToSelect = e!.KeyboardAccelerator.Key switch
+			if (e is null)
+				return;
+
+			var indexToSelect = e.KeyboardAccelerator.Key switch
 			{
 				VirtualKey.Number1 => 0,
 				VirtualKey.Number2 => 1,
@@ -412,7 +415,8 @@ private async void ExecuteNavigateToNumberedTabKeyboardAcceleratorCommand(Keyboa
 				await Task.Delay(500);
 
 				// Focus the content of the selected tab item (needed for keyboard navigation)
-				context.ShellPage!.PaneHolder.FocusActivePane();
+				var paneHolder = context.ShellPage.GetRequiredPaneHolder();
+				paneHolder.FocusActivePane();
 			}
 
 			e.Handled = true;
diff --git a/src/Files.App/ViewModels/Properties/BasePropertiesPage.cs b/src/Files.App/ViewModels/Properties/BasePropertiesPage.cs
index 784912b38e30..f9d038f5c184 100644
--- a/src/Files.App/ViewModels/Properties/BasePropertiesPage.cs
+++ b/src/Files.App/ViewModels/Properties/BasePropertiesPage.cs
@@ -14,9 +14,11 @@ public abstract class BasePropertiesPage : Page, IDisposable
 	{
 		private ICommonDialogService CommonDialogService { get; } = Ioc.Default.GetRequiredService<ICommonDialogService>();
 
-		public IShellPage AppInstance = null;
+		private IShellPage? appInstance;
+		public IShellPage AppInstance
+			=> appInstance ?? throw new InvalidOperationException("The properties page has not been initialized.");
 
-		public BaseProperties BaseProperties { get; set; }
+		public BaseProperties? BaseProperties { get; set; }
 
 		public SelectedItemsPropertiesViewModel ViewModel { get; set; } = new();
 
@@ -28,25 +30,32 @@ protected virtual void Properties_Loaded(object sender, RoutedEventArgs e)
 		protected override void OnNavigatedTo(NavigationEventArgs e)
 		{
 			var np = (PropertiesPageNavigationParameter)e.Parameter;
-			AppInstance = np.AppInstance;
+			var tokenSource = np.CancellationTokenSource
+				?? throw new InvalidOperationException("The properties page does not have a cancellation token source.");
+			var instance = np.AppInstance
+				?? throw new InvalidOperationException("The properties page does not have an associated shell page.");
+			var window = np.Window
+				?? throw new InvalidOperationException("The properties page does not have an associated window.");
+			appInstance = instance;
 
 			// Library
 			if (np.Parameter is LibraryItem library)
-				BaseProperties = new LibraryProperties(ViewModel, np.CancellationTokenSource, DispatcherQueue, library, AppInstance);
+				BaseProperties = new LibraryProperties(ViewModel, tokenSource, DispatcherQueue, library, instance);
 			// Drive
 			else if (np.Parameter is DriveItem drive)
 			{
-				var props = new DriveProperties(ViewModel, drive, AppInstance);
+				var props = new DriveProperties(ViewModel, tokenSource, DispatcherQueue, drive, instance);
 				BaseProperties = props;
+				var drivePath = props.Drive.GetRequiredPath();
 
 				ViewModel.CleanupVisibility = props.Drive.Type != DriveType.Network && props.Drive.Type != DriveType.CloudDrive;
 				ViewModel.FormatVisibility = !(props.Drive.Type == DriveType.Network || props.Drive.Type == DriveType.CloudDrive || string.Equals(props.Drive.Path, $@"{Constants.UserEnvironmentPaths.SystemDrivePath}\", StringComparison.OrdinalIgnoreCase));
-				ViewModel.CleanupDriveCommand = new AsyncRelayCommand(() => StorageSenseHelper.OpenStorageSenseAsync(props.Drive.Path));
+				ViewModel.CleanupDriveCommand = new AsyncRelayCommand(() => StorageSenseHelper.OpenStorageSenseAsync(drivePath));
 				ViewModel.FormatDriveCommand = new RelayCommand(async () =>
 				{
 					try
 					{
-						await Win32Helper.OpenFormatDriveDialog(props.Drive.Path);
+						await Win32Helper.OpenFormatDriveDialog(drivePath);
 					}
 					catch (Exception)
 					{
@@ -59,7 +68,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 				// Selection only contains files
 				if (items.All(item => item.PrimaryItemAttribute == StorageItemTypes.File || item.IsArchive))
 				{
-					BaseProperties = new CombinedFileProperties(ViewModel, np.CancellationTokenSource, DispatcherQueue, items, AppInstance);
+					BaseProperties = new CombinedFileProperties(ViewModel, tokenSource, DispatcherQueue, items, instance);
 
 					ViewModel.IsEditAlbumCoverVisible =
 						items.All(item => item.FileExtension is not ".avi") && (
@@ -68,22 +77,22 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 				}
 				// Selection includes folders
 				else
-					BaseProperties = new CombinedProperties(ViewModel, np.CancellationTokenSource, DispatcherQueue, items, AppInstance);
+					BaseProperties = new CombinedProperties(ViewModel, tokenSource, DispatcherQueue, items, instance);
 			}
 			// A storage object
 			else if (np.Parameter is ListedItem item)
 			{
 				// File or Archive
 				if (item.PrimaryItemAttribute == StorageItemTypes.File || item.IsArchive)
-					BaseProperties = new FileProperties(ViewModel, np.CancellationTokenSource, DispatcherQueue, item, AppInstance);
+					BaseProperties = new FileProperties(ViewModel, tokenSource, DispatcherQueue, item, instance);
 				// Folder
 				else if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
-					BaseProperties = new FolderProperties(ViewModel, np.CancellationTokenSource, DispatcherQueue, item, AppInstance);
+					BaseProperties = new FolderProperties(ViewModel, tokenSource, DispatcherQueue, item, instance);
 			}
 
 			ViewModel.EditAlbumCoverCommand = new RelayCommand(async () =>
 			{
-				var hWnd = Microsoft.UI.Win32Interop.GetWindowFromWindowId(np.Window.AppWindow.Id);
+				var hWnd = Microsoft.UI.Win32Interop.GetWindowFromWindowId(window.AppWindow.Id);
 
 				string[] extensions =
 				[
@@ -114,7 +123,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 				ViewModel.IsAblumCoverModified = true;
 				ViewModel.ModifiedAlbumCover = null;
 
-				string mediaPath = np.Parameter switch
+				string? mediaPath = np.Parameter switch
 				{
 					ListedItem singleItem => singleItem.ItemPath,
 					List<ListedItem> items => items.FirstOrDefault()?.ItemPath,
diff --git a/src/Files.App/ViewModels/Properties/CompatibilityViewModel.cs b/src/Files.App/ViewModels/Properties/CompatibilityViewModel.cs
index 41935ce228d8..069fc89d34c5 100644
--- a/src/Files.App/ViewModels/Properties/CompatibilityViewModel.cs
+++ b/src/Files.App/ViewModels/Properties/CompatibilityViewModel.cs
@@ -81,7 +81,9 @@ public string SelectedHighDpiOverride
 
 		public CompatibilityViewModel(ListedItem item)
 		{
-			ItemPath = item is IShortcutItem shortcutItem ? shortcutItem.TargetPath : item.ItemPath;
+			var targetPath = (item as IShortcutItem)?.TargetPath;
+			ItemPath = (!string.IsNullOrEmpty(targetPath) ? targetPath : item.ItemPath)
+				?? throw new InvalidOperationException("The selected item does not have a compatibility target path.");
 
 			CompatibilityOptions = WindowsCompatibilityService.GetCompatibilityOptionsForPath(ItemPath);
 
diff --git a/src/Files.App/ViewModels/Properties/CustomizationViewModel.cs b/src/Files.App/ViewModels/Properties/CustomizationViewModel.cs
index b6869ec059a5..d089db854643 100644
--- a/src/Files.App/ViewModels/Properties/CustomizationViewModel.cs
+++ b/src/Files.App/ViewModels/Properties/CustomizationViewModel.cs
@@ -11,11 +11,11 @@ public sealed partial class CustomizationViewModel : ObservableObject
 		private static string DefaultIconDllFilePath
 			=> Path.Combine(Constants.UserEnvironmentPaths.SystemRootPath, "System32", "SHELL32.dll");
 
-		private readonly AppWindow _appWindow;
+		private readonly AppWindow? _appWindow;
 
-		private readonly IShellPage _appInstance;
+		private readonly IShellPage? _appInstance;
 
-		private readonly string _selectedItemPath;
+		private readonly string? _selectedItemPath;
 
 		private bool _isIconChanged;
 
@@ -23,8 +23,8 @@ private static string DefaultIconDllFilePath
 
 		public ObservableCollection<IconFileInfo> DllIcons { get; } = [];
 
-		private string _IconResourceItemPath;
-		public string IconResourceItemPath
+		private string? _IconResourceItemPath;
+		public string? IconResourceItemPath
 		{
 			get => _IconResourceItemPath;
 			set
@@ -57,13 +57,12 @@ public IconFileInfo? SelectedDllIcon
 			}
 		}
 
-		public ICommand RestoreDefaultIconCommand { get; private set; }
-		public ICommand OpenFilePickerCommand { get; private set; }
+		public ICommand? RestoreDefaultIconCommand { get; private set; }
+		public ICommand? OpenFilePickerCommand { get; private set; }
 
 		public CustomizationViewModel(IShellPage appInstance, BaseProperties baseProperties, AppWindow appWindow)
 		{
-			ListedItem item;
-
+			ListedItem? item;
 			if (baseProperties is FileProperties fileProperties)
 				item = fileProperties.Item;
 			else if (baseProperties is FolderProperties folderProperties)
@@ -90,7 +89,8 @@ private void ExecuteRestoreDefaultIconCommand()
 
 		private void ExecuteOpenFilePickerCommand()
 		{
-			var parentWindowId = _appWindow.Id;
+			var parentWindowId = (_appWindow
+				?? throw new InvalidOperationException("The customization window has not been initialized.")).Id;
 			var hWnd = Microsoft.UI.Win32Interop.GetWindowFromWindowId(parentWindowId);
 
 			string[] extensions =
@@ -112,19 +112,21 @@ public async Task<bool> UpdateIcon()
 			if (!_isIconChanged)
 				return false;
 
+			var selectedItemPath = _selectedItemPath
+				?? throw new InvalidOperationException("The selected item path has not been initialized.");
 			bool result = false;
 
 			if (SelectedDllIcon is null)
 			{
 				result = IsShortcut
-					? Win32Helper.SetCustomFileIcon(_selectedItemPath, null)
-					: Win32Helper.SetCustomDirectoryIcon(_selectedItemPath, null);
+					? Win32Helper.SetCustomFileIcon(selectedItemPath, null)
+					: Win32Helper.SetCustomDirectoryIcon(selectedItemPath, null);
 			}
 			else
 			{
 				result = IsShortcut
-					? Win32Helper.SetCustomFileIcon(_selectedItemPath, IconResourceItemPath, SelectedDllIcon.Index)
-					: Win32Helper.SetCustomDirectoryIcon(_selectedItemPath, IconResourceItemPath, SelectedDllIcon.Index);
+					? Win32Helper.SetCustomFileIcon(selectedItemPath, IconResourceItemPath, SelectedDllIcon.Index)
+					: Win32Helper.SetCustomDirectoryIcon(selectedItemPath, IconResourceItemPath, SelectedDllIcon.Index);
 			}
 
 			if (!result)
diff --git a/src/Files.App/ViewModels/Properties/HashesViewModel.cs b/src/Files.App/ViewModels/Properties/HashesViewModel.cs
index f23631094043..d6ef66e08e85 100644
--- a/src/Files.App/ViewModels/Properties/HashesViewModel.cs
+++ b/src/Files.App/ViewModels/Properties/HashesViewModel.cs
@@ -13,12 +13,12 @@ namespace Files.App.ViewModels.Properties
 	public sealed partial class HashesViewModel : ObservableObject, IDisposable
 	{
 		private ICommonDialogService CommonDialogService { get; } = Ioc.Default.GetRequiredService<ICommonDialogService>();
-		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>()!;
+		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
 		private readonly AppWindow _appWindow;
 
-		private HashInfoItem _selectedItem;
-		public HashInfoItem SelectedItem
+		private HashInfoItem? _selectedItem;
+		public HashInfoItem? SelectedItem
 		{
 			get => _selectedItem;
 			set => SetProperty(ref _selectedItem, value);
@@ -35,8 +35,8 @@ public HashInfoItem SelectedItem
 
 		private CancellationTokenSource _cancellationTokenSource;
 
-		private string _hashInput;
-		public string HashInput
+		private string? _hashInput;
+		public string? HashInput
 		{
 			get => _hashInput;
 			set
@@ -55,8 +55,8 @@ public InfoBarSeverity InfoBarSeverity
 			set => SetProperty(ref _infoBarSeverity, value);
 		}
 
-		private string _infoBarTitle;
-		public string InfoBarTitle
+		private string? _infoBarTitle;
+		public string? InfoBarTitle
 		{
 			get => _infoBarTitle;
 			set => SetProperty(ref _infoBarTitle, value);
@@ -123,7 +123,8 @@ private void ToggleIsEnabled(string? algorithm)
 				{
 					try
 					{
-						await using (var stream = File.OpenRead(_item.ItemPath))
+						var itemPath = _item.GetRequiredPath();
+						await using (var stream = File.OpenRead(itemPath))
 						{
 							hashInfoItem.HashValue = hashInfoItem.Algorithm switch
 							{
@@ -133,7 +134,7 @@ private void ToggleIsEnabled(string? algorithm)
 								"SHA256" => await ChecksumHelpers.CreateSHA256(stream, _cancellationTokenSource.Token),
 								"SHA384" => await ChecksumHelpers.CreateSHA384(stream, _cancellationTokenSource.Token),
 								"SHA512" => await ChecksumHelpers.CreateSHA512(stream, _cancellationTokenSource.Token),
-								_ => throw new InvalidOperationException()
+								_ => throw new InvalidOperationException($"The hash algorithm '{hashInfoItem.Algorithm}' is not supported.")
 							};
 						}
 
@@ -160,7 +161,7 @@ private void ToggleIsEnabled(string? algorithm)
 			}
 		}
 
-		public string FindMatchingAlgorithm(string hash)
+		public string FindMatchingAlgorithm(string? hash)
 		{
 			if (string.IsNullOrEmpty(hash))
 				return string.Empty;
diff --git a/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs b/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs
index c204b74af287..abd10d94b9be 100644
--- a/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs
+++ b/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs
@@ -10,13 +10,25 @@ namespace Files.App.ViewModels.Properties
 {
 	public abstract class BaseProperties
 	{
-		public IShellPage AppInstance { get; set; } = null;
+		public IShellPage AppInstance { get; }
 
-		public SelectedItemsPropertiesViewModel ViewModel { get; set; }
+		public SelectedItemsPropertiesViewModel ViewModel { get; }
 
-		public CancellationTokenSource TokenSource { get; set; }
+		public CancellationTokenSource TokenSource { get; }
 
-		public DispatcherQueue Dispatcher { get; set; }
+		public DispatcherQueue Dispatcher { get; }
+
+		protected BaseProperties(
+			SelectedItemsPropertiesViewModel viewModel,
+			CancellationTokenSource tokenSource,
+			DispatcherQueue dispatcher,
+			IShellPage appInstance)
+		{
+			ViewModel = viewModel;
+			TokenSource = tokenSource;
+			Dispatcher = dispatcher;
+			AppInstance = appInstance;
+		}
 
 		public abstract void GetBaseProperties();
 
diff --git a/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs b/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs
index 5f1855943311..49c9aa88e31d 100644
--- a/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs
+++ b/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs
@@ -19,8 +19,9 @@ public async Task GetSystemFilePropertiesAsync()
 		{
 			var queries = await Task.WhenAll(List.AsParallel().Select(async item =>
 			{
-				BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.ItemPath));
-				if (file is null)
+				var itemPath = item.GetRequiredPath();
+				var fileResult = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath));
+				if (fileResult.Result is not { } file)
 				{
 					// Could not access file, can't show any other property
 					return null;
@@ -28,17 +29,21 @@ public async Task GetSystemFilePropertiesAsync()
 
 				var list = await FileProperty.RetrieveAndInitializePropertiesAsync(file);
 
-				var latitude = list.Find(x => x.Property == "System.GPS.LatitudeDecimal")?.Value as double?;
-				var longitude = list.Find(x => x.Property == "System.GPS.LongitudeDecimal")?.Value as double?;
-				var addressItem = list.Find(x => x.ID == "address");
+				var latitudeProperty = list.Find(x => x.Property == "System.GPS.LatitudeDecimal")
+					?? throw new InvalidOperationException("The file property definitions do not contain the latitude property.");
+				var longitudeProperty = list.Find(x => x.Property == "System.GPS.LongitudeDecimal")
+					?? throw new InvalidOperationException("The file property definitions do not contain the longitude property.");
+				var addressItem = list.Find(x => x.ID == "address")
+					?? throw new InvalidOperationException("The file property definitions do not contain the address property.");
 
-				if (latitude.HasValue && longitude.HasValue && addressItem != null)
-					addressItem.Value = await LocationHelpers.GetAddressFromCoordinatesAsync(latitude.Value, longitude.Value);
+				addressItem.Value = await LocationHelpers.GetAddressFromCoordinatesAsync(
+					(double?)latitudeProperty.Value,
+					(double?)longitudeProperty.Value);
 
 
 				return list
 					.Where(fileProp => !(fileProp.Value is null && fileProp.IsReadOnly))
-					.GroupBy(fileProp => fileProp.SectionResource)
+					.GroupBy(fileProp => fileProp.SectionResource!)
 					.Select(group => new FilePropertySection(group) { Key = group.Key })
 					.Where(section => !section.All(fileProp => fileProp.Value is null)
 						|| FileProperty.IsSectionApplicableForEmpty(section.Key, item.FileExtension));
@@ -47,19 +52,25 @@ public async Task GetSystemFilePropertiesAsync()
 			if (queries.Any(query => query is null))
 				return;
 
+			var validQueries = queries.WhereNotNull().ToArray();
+			if (validQueries.Length == 0)
+				throw new InvalidOperationException("No selected files were available for property aggregation.");
+
 			// Display only the sections that all files have
-			var keys = queries.Select(query => query!.Select(section => section.Key)).Aggregate((x, y) => x.Intersect(y));
-			var sections = queries[0]!.Where(section => keys.Contains(section.Key)).OrderBy(group => group.Priority).ToArray();
+			var keys = validQueries.Select(query => query.Select(section => section.Key)).Aggregate((x, y) => x.Intersect(y));
+			var sections = validQueries[0].Where(section => keys.Contains(section.Key)).OrderBy(group => group.Priority).ToArray();
 
 			foreach (var group in sections)
 			{
-				var props = queries.SelectMany(query => query!.First(section => section.Key == group.Key));
+				var props = validQueries.SelectMany(query => query.First(section => section.Key == group.Key));
 				foreach (FileProperty prop in group)
 				{
 					if (prop.Property == "System.Media.Duration")
 					{
 						ulong totalDuration = 0;
-						props.Where(x => x.Property == prop.Property).ForEach(x => totalDuration += (ulong)x.Value);
+						props.Where(x => x.Property == prop.Property).ForEach(x =>
+							totalDuration += (ulong)(x.Value
+								?? throw new InvalidOperationException("A media duration property does not have a value.")));
 						prop.Value = totalDuration;
 					}
 					else if (props.Where(x => x.Property == prop.Property).Any(x => !Equals(x.Value, prop.Value)))
@@ -79,10 +90,10 @@ public async Task SyncPropertyChangesAsync()
 			var files = new List<BaseStorageFile>();
 			foreach (var item in List)
 			{
-				BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.ItemPath));
-
 				// Couldn't access the file to save properties
-				if (file is null)
+				var itemPath = item.GetRequiredPath();
+				var fileResult = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath));
+				if (fileResult.Result is not { } file)
 					return;
 
 				files.Add(file);
@@ -96,9 +107,11 @@ public async Task SyncPropertyChangesAsync()
 				{
 					if (!prop.IsReadOnly && prop.Modified)
 					{
-						var newDict = new Dictionary<string, object>
+						var propertyName = prop.Property
+							?? throw new InvalidOperationException("An editable file property does not have an identifier.");
+						var newDict = new Dictionary<string, object?>
 						{
-							{ prop.Property, prop.Value }
+							{ propertyName, prop.Value }
 						};
 
 						foreach (var file in files)
@@ -107,7 +120,7 @@ public async Task SyncPropertyChangesAsync()
 							{
 								if (file.Properties is not null)
 								{
-									await file.Properties.SavePropertiesAsync(newDict);
+									await file.Properties.SaveNullablePropertiesAsync(newDict);
 								}
 							}
 							catch
@@ -131,9 +144,9 @@ public async Task ClearPropertiesAsync()
 			var files = new List<BaseStorageFile>();
 			foreach (var item in List)
 			{
-				BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.ItemPath));
-
-				if (file is null)
+				var itemPath = item.GetRequiredPath();
+				var fileResult = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath));
+				if (fileResult.Result is not { } file)
 					return;
 
 				files.Add(file);
@@ -145,9 +158,11 @@ public async Task ClearPropertiesAsync()
 				{
 					if (!prop.IsReadOnly)
 					{
-						var newDict = new Dictionary<string, object>
+						var propertyName = prop.Property
+							?? throw new InvalidOperationException("An editable file property does not have an identifier.");
+						var newDict = new Dictionary<string, object?>
 						{
-							{ prop.Property, null }
+							{ propertyName, null }
 						};
 
 						foreach (var file in files)
@@ -156,7 +171,7 @@ public async Task ClearPropertiesAsync()
 							{
 								if (file.Properties is not null)
 								{
-									await file.Properties.SavePropertiesAsync(newDict);
+									await file.Properties.SaveNullablePropertiesAsync(newDict);
 								}
 							}
 							catch
diff --git a/src/Files.App/ViewModels/Properties/Items/CombinedProperties.cs b/src/Files.App/ViewModels/Properties/Items/CombinedProperties.cs
index da6721fcb94d..dceb32292fec 100644
--- a/src/Files.App/ViewModels/Properties/Items/CombinedProperties.cs
+++ b/src/Files.App/ViewModels/Properties/Items/CombinedProperties.cs
@@ -15,47 +15,53 @@ public CombinedProperties(
 			DispatcherQueue coreDispatcher,
 			List<ListedItem> listedItems,
 			IShellPage instance)
+			: base(viewModel, tokenSource, coreDispatcher, instance)
 		{
-			ViewModel = viewModel;
-			TokenSource = tokenSource;
-			Dispatcher = coreDispatcher;
 			List = listedItems;
-			AppInstance = instance;
 			GetBaseProperties();
 			ViewModel.PropertyChanged += ViewModel_PropertyChanged;
 		}
 
 		public sealed override void GetBaseProperties()
 		{
-			if (List is not null)
+			ViewModel.LoadCombinedItemsGlyph = true;
+			var firstItemType = List.First().ItemType
+				?? throw new InvalidOperationException("A selected item does not have a type.");
+
+			if (List.All(x => string.Equals(
+				x.ItemType ?? throw new InvalidOperationException("A selected item does not have a type."),
+				firstItemType,
+				StringComparison.Ordinal)))
 			{
-				ViewModel.LoadCombinedItemsGlyph = true;
-
-				if (List.All(x => x.ItemType.Equals(List.First().ItemType)))
-				{
-					ViewModel.ItemType = string.Format(Strings.PropertiesDriveItemTypesEquals.GetLocalizedResource(), List.First().ItemType);
-				}
-				else
-				{
-					ViewModel.ItemType = Strings.PropertiesDriveItemTypeDifferent.GetLocalizedResource();
-				}
+				ViewModel.ItemType = string.Format(Strings.PropertiesDriveItemTypesEquals.GetLocalizedResource(), firstItemType);
+			}
+			else
+			{
+				ViewModel.ItemType = Strings.PropertiesDriveItemTypeDifferent.GetLocalizedResource();
+			}
 
-				var itemsPath = List.Select(Item => (Item as RecycleBinItem)?.ItemOriginalFolder ??
-					(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath));
+			var itemsPath = List.Select(item =>
+			{
+				var itemPath = item.GetRequiredPath();
+				return (item as RecycleBinItem)?.ItemOriginalFolder ??
+					(Path.IsPathRooted(itemPath) ? Path.GetDirectoryName(itemPath) : itemPath);
+			});
 
-				if (itemsPath.Distinct().Count() == 1)
-					ViewModel.ItemLocation = string.Format(Strings.PropertiesCombinedItemLocation.GetLocalizedResource(), itemsPath.First());
-			}
+			if (itemsPath.Distinct().Count() == 1)
+				ViewModel.ItemLocation = string.Format(Strings.PropertiesCombinedItemLocation.GetLocalizedResource(), itemsPath.First());
 		}
 
 		public override async Task GetSpecialPropertiesAsync()
 		{
+			var itemsWithPaths = List.Select(item => (
+				Item: item,
+				Path: item.GetRequiredPath())).ToList();
 			bool allFiles = true, allReadOnly = true, allNotReadOnly = true, allHidden = true, allNotHidden = true;
 			bool allCompressed = true, allNotCompressed = true, anyCanCompress = false;
-			foreach (var x in List)
+			foreach (var (x, path) in itemsWithPaths)
 			{
 				allFiles &= x.PrimaryItemAttribute == StorageItemTypes.File;
-				var fileAttributes = Win32Helper.GetFileAttributes(x.ItemPath);
+				var fileAttributes = Win32Helper.GetFileAttributes(path);
 				bool isReadOnly = fileAttributes.HasFlag(System.IO.FileAttributes.ReadOnly);
 				allReadOnly &= isReadOnly;
 				allNotReadOnly &= !isReadOnly;
@@ -65,7 +71,7 @@ public override async Task GetSpecialPropertiesAsync()
 				bool isCompressed = fileAttributes.HasFlag(System.IO.FileAttributes.Compressed);
 				allCompressed &= isCompressed;
 				allNotCompressed &= !isCompressed;
-				anyCanCompress |= Win32Helper.CanCompressContent(x.ItemPath);
+				anyCanCompress |= Win32Helper.CanCompressContent(path);
 			}
 			
 			if (allFiles)
@@ -101,15 +107,15 @@ public override async Task GetSpecialPropertiesAsync()
 
 			long filesSize = List.Where(x => x.PrimaryItemAttribute == StorageItemTypes.File).Sum(x => x.FileSizeBytes);
 			long foldersSize = 0;
-			long filesSizeOnDisk = List.Where(x => x.PrimaryItemAttribute == StorageItemTypes.File &&
-				x.SyncStatusUI.SyncStatus is not CloudDriveSyncStatus.FileOnline and not CloudDriveSyncStatus.FolderOnline)
-					.Sum(x => Win32Helper.GetFileSizeOnDisk(x.ItemPath) ?? 0);
+			long filesSizeOnDisk = itemsWithPaths.Where(x => x.Item.PrimaryItemAttribute == StorageItemTypes.File &&
+				x.Item.SyncStatusUI.SyncStatus is not CloudDriveSyncStatus.FileOnline and not CloudDriveSyncStatus.FolderOnline)
+					.Sum(x => Win32Helper.GetFileSizeOnDisk(x.Path) ?? 0);
 			long foldersSizeOnDisk = 0;
 
 			ViewModel.ItemSizeProgressVisibility = true;
 			ViewModel.ItemSizeOnDiskProgressVisibility = true;
 
-			foreach (var item in List)
+			foreach (var (item, path) in itemsWithPaths)
 			{
 				if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
 				{
@@ -118,7 +124,7 @@ CloudDriveSyncStatus.FolderOnline or
 						CloudDriveSyncStatus.FolderOfflinePartial)
 						continue;
 
-					var folderSizeTask = Task.Run(() => CalculateFolderSizeAsync(item.ItemPath, TokenSource.Token));
+					var folderSizeTask = Task.Run(() => CalculateFolderSizeAsync(path, TokenSource.Token));
 
 					try
 					{
@@ -144,7 +150,7 @@ CloudDriveSyncStatus.FolderOnline or
 			SetItemsCountString();
 		}
 
-		private async void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		private async void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
 		{
 			switch (e.PropertyName)
 			{
@@ -152,15 +158,16 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 					{
 						if (ViewModel.IsReadOnly is not null)
 						{
+							var itemPaths = List.Select(item => item.GetRequiredPath()).ToList();
 							if ((bool)ViewModel.IsReadOnly)
 							{
-								List.ForEach(x => Win32Helper.SetFileAttribute(
-									x.ItemPath, System.IO.FileAttributes.ReadOnly));
+								itemPaths.ForEach(path => Win32Helper.SetFileAttribute(
+									path, System.IO.FileAttributes.ReadOnly));
 							}
 							else
 							{
-								List.ForEach(x => Win32Helper.UnsetFileAttribute(
-									x.ItemPath, System.IO.FileAttributes.ReadOnly));
+								itemPaths.ForEach(path => Win32Helper.UnsetFileAttribute(
+									path, System.IO.FileAttributes.ReadOnly));
 							}
 						}
 					}
@@ -170,15 +177,16 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 					{
 						if (ViewModel.IsHidden is not null)
 						{
+							var itemPaths = List.Select(item => item.GetRequiredPath()).ToList();
 							if ((bool)ViewModel.IsHidden)
 							{
-								List.ForEach(x => Win32Helper.SetFileAttribute(
-									x.ItemPath, System.IO.FileAttributes.Hidden));
+								itemPaths.ForEach(path => Win32Helper.SetFileAttribute(
+									path, System.IO.FileAttributes.Hidden));
 							}
 							else
 							{
-								List.ForEach(x => Win32Helper.UnsetFileAttribute(
-									x.ItemPath, System.IO.FileAttributes.Hidden));
+								itemPaths.ForEach(path => Win32Helper.UnsetFileAttribute(
+									path, System.IO.FileAttributes.Hidden));
 							}
 						}
 
@@ -188,7 +196,7 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 				case "IsContentCompressed":
 					{
 						var isCompressed = ViewModel.IsContentCompressed ?? false;
-						var items = List.Select(x => x.ItemPath).ToList();
+						var items = List.Select(item => item.GetRequiredPath()).ToList();
 						await Task.Run(() =>
 						{
 							foreach (var path in items)
diff --git a/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs b/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs
index 719a9212afce..15f11b26bf94 100644
--- a/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs
+++ b/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs
@@ -6,11 +6,15 @@ internal sealed class DriveProperties : BaseProperties
 	{
 		public DriveItem Drive { get; }
 
-		public DriveProperties(SelectedItemsPropertiesViewModel viewModel, DriveItem driveItem, IShellPage instance)
+		public DriveProperties(
+			SelectedItemsPropertiesViewModel viewModel,
+			CancellationTokenSource tokenSource,
+			Microsoft.UI.Dispatching.DispatcherQueue dispatcher,
+			DriveItem driveItem,
+			IShellPage instance)
+			: base(viewModel, tokenSource, dispatcher, instance)
 		{
-			ViewModel = viewModel;
 			Drive = driveItem;
-			AppInstance = instance;
 			GetBaseProperties();
 		}
 
@@ -38,14 +42,17 @@ public override void GetBaseProperties()
 		public async override Task GetSpecialPropertiesAsync()
 		{
 			ViewModel.ItemAttributesVisibility = false;
+			var drivePath = Drive.GetRequiredPath();
 
-			var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(Drive.Path));
-			BaseStorageFolder diskRoot = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(Drive.Path, item));
+			var rootResult = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(drivePath));
+			var diskRootResult = await FilesystemTasks.WrapNullable(
+				() => StorageFileExtensions.DangerousGetFolderFromPathAsync(drivePath, rootResult.Result));
+			var diskRoot = diskRootResult.Result;
 
 			if (ViewModel.LoadFileIcon)
 			{
 				var result = await FileThumbnailHelper.GetIconAsync(
-					Drive.Path,
+					drivePath,
 					Constants.ShellIconSizes.ExtraLarge,
 					true,
 					IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);
@@ -73,7 +80,7 @@ public async override Task GetSpecialPropertiesAsync()
 
 			try
 			{
-				var syncRootStatus = await SyncRootHelpers.GetSyncRootQuotaAsync(Drive.Path);
+				var syncRootStatus = await SyncRootHelpers.GetSyncRootQuotaAsync(drivePath);
 				if (syncRootStatus.Success)
 				{
 					ViewModel.DriveCapacityValue = syncRootStatus.Capacity;
diff --git a/src/Files.App/ViewModels/Properties/Items/FileProperties.cs b/src/Files.App/ViewModels/Properties/Items/FileProperties.cs
index 2aa9d02e59c6..77349dd21ab0 100644
--- a/src/Files.App/ViewModels/Properties/Items/FileProperties.cs
+++ b/src/Files.App/ViewModels/Properties/Items/FileProperties.cs
@@ -17,12 +17,9 @@ public FileProperties(
 			DispatcherQueue coreDispatcher,
 			ListedItem item,
 			IShellPage instance)
+			: base(viewModel, tokenSource, coreDispatcher, instance)
 		{
-			ViewModel = viewModel;
-			TokenSource = tokenSource;
-			Dispatcher = coreDispatcher;
 			Item = item;
-			AppInstance = instance;
 
 			GetBaseProperties();
 
@@ -31,20 +28,19 @@ public FileProperties(
 
 		public override void GetBaseProperties()
 		{
-			if (Item is null)
-				return;
+			var itemPath = Item.GetRequiredPath();
 
 			ViewModel.ItemName = Item.Name;
 			ViewModel.OriginalItemName = Item.Name;
 			ViewModel.ItemType = Item.ItemType;
 			ViewModel.ItemLocation = (Item as RecycleBinItem)?.ItemOriginalFolder ??
-				(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath);
+				(Path.IsPathRooted(itemPath) ? Path.GetDirectoryName(itemPath) : itemPath);
 			ViewModel.ItemModifiedTimestampReal = Item.ItemDateModifiedReal;
 			ViewModel.ItemCreatedTimestampReal = Item.ItemDateCreatedReal;
 			ViewModel.LoadCustomIcon = Item.LoadCustomIcon;
 			ViewModel.CustomIconSource = Item.CustomIconSource;
 			ViewModel.LoadFileIcon = Item.LoadFileIcon;
-			ViewModel.IsDownloadedFile = Win32Helper.ReadStringFromFile($"{Item.ItemPath}:Zone.Identifier") is not null;
+			ViewModel.IsDownloadedFile = Win32Helper.ReadStringFromFile($"{itemPath}:Zone.Identifier") is not null;
 			ViewModel.IsEditAlbumCoverVisible =
 				Item.FileExtension is not ".avi" && (
 				FileExtensionHelpers.IsVideoFile(Item.FileExtension) ||
@@ -77,14 +73,17 @@ public override void GetBaseProperties()
 
 			ViewModel.ShortcutItemOpenLinkCommand = new RelayCommand(async () =>
 			{
+				var shortcutPath = ViewModel.ShortcutItemPath
+					?? throw new InvalidOperationException("The shortcut does not have a target path.");
+
 				if (Item.IsLinkItem)
 				{
-					await Win32Helper.InvokeWin32ComponentAsync(ViewModel.ShortcutItemPath, AppInstance, ViewModel.ShortcutItemArguments, ViewModel.RunAsAdmin, ViewModel.ShortcutItemWorkingDir);
+					await Win32Helper.InvokeWin32ComponentAsync(shortcutPath, AppInstance, ViewModel.ShortcutItemArguments, ViewModel.RunAsAdmin, ViewModel.ShortcutItemWorkingDir);
 				}
 				else
 				{
 					await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(
-						() => NavigationHelpers.OpenPathInNewTab(Path.GetDirectoryName(ViewModel.ShortcutItemPath), true));
+						() => NavigationHelpers.OpenPathInNewTab(Path.GetDirectoryName(shortcutPath), true));
 				}
 			},
 			() =>
@@ -95,14 +94,16 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(
 
 		public override async Task GetSpecialPropertiesAsync()
 		{
+			var itemPath = Item.GetRequiredPath();
+
 			// Check if item is on device (not online)
 			var isOnDevice = Item.SyncStatusUI.SyncStatus is not CloudDriveSyncStatus.FileOnline and not CloudDriveSyncStatus.FolderOnline;
 
 			// Set basic file attributes
-			FileAttributes fileAttributes = Win32Helper.GetFileAttributes(Item.ItemPath);
+			FileAttributes fileAttributes = Win32Helper.GetFileAttributes(itemPath);
 			ViewModel.IsReadOnly = fileAttributes.HasFlag(FileAttributes.ReadOnly);
 			ViewModel.IsHidden = fileAttributes.HasFlag(FileAttributes.Hidden);
-			ViewModel.CanCompressContent = Win32Helper.CanCompressContent(Item.ItemPath);
+			ViewModel.CanCompressContent = Win32Helper.CanCompressContent(itemPath);
 			ViewModel.ItemSizeVisibility = true;
 			ViewModel.ItemSize = Item.FileSizeBytes.ToLongSizeString();
 
@@ -110,12 +111,12 @@ public override async Task GetSpecialPropertiesAsync()
 			if (isOnDevice)
 			{
 				ViewModel.IsContentCompressed = fileAttributes.HasFlag(FileAttributes.Compressed);
-				ViewModel.ItemSizeOnDisk = Win32Helper.GetFileSizeOnDisk(Item.ItemPath)?.ToLongSizeString() ?? string.Empty;
+				ViewModel.ItemSizeOnDisk = Win32Helper.GetFileSizeOnDisk(itemPath)?.ToLongSizeString() ?? string.Empty;
 			}
 
 			// Load icon
 			var result = await FileThumbnailHelper.GetIconAsync(
-				Item.ItemPath,
+				itemPath,
 				Constants.ShellIconSizes.ExtraLarge,
 				false,
 				IconOptions.UseCurrentScale);
@@ -141,11 +142,13 @@ public override async Task GetSpecialPropertiesAsync()
 			}
 
 			// Get file for further processing
-			string filePath = (Item as IShortcutItem)?.TargetPath ?? Item.ItemPath;
-			BaseStorageFile file = await AppInstance.ShellViewModel.GetFileFromPathAsync(filePath);
+			var targetPath = (Item as IShortcutItem)?.TargetPath;
+			string filePath = !string.IsNullOrEmpty(targetPath) ? targetPath : itemPath;
+			var shellViewModel = AppInstance.GetRequiredShellViewModel();
 
 			// Couldn't access the file and can't load any other properties
-			if (file is null)
+			var fileResult = await shellViewModel.GetFileFromPathAsync(filePath);
+			if (fileResult.Result is not { } file)
 				return;
 
 			// Can't load any other properties
@@ -155,7 +158,7 @@ public override async Task GetSpecialPropertiesAsync()
 			// Load uncompressed size for browsable zip files on device
 			if (isOnDevice && FileExtensionHelpers.IsBrowsableZipFile(Item.FileExtension, out _))
 			{
-				if (await ZipStorageFolder.FromPathAsync(Item.ItemPath) is ZipStorageFolder zipFolder)
+				if (await ZipStorageFolder.FromPathAsync(itemPath) is ZipStorageFolder zipFolder)
 				{
 					var uncompressedSize = await zipFolder.GetUncompressedSize();
 					ViewModel.UncompressedItemSize = uncompressedSize.ToLongSizeString();
@@ -170,8 +173,9 @@ public override async Task GetSpecialPropertiesAsync()
 
 		public async Task GetSystemFilePropertiesAsync()
 		{
-			BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(Item.ItemPath));
-			if (file is null)
+			var itemPath = Item.GetRequiredPath();
+			var fileResult = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath));
+			if (fileResult.Result is not { } file)
 			{
 				// Could not access file, can't show any other property
 				return;
@@ -179,14 +183,19 @@ public async Task GetSystemFilePropertiesAsync()
 
 			var list = await FileProperty.RetrieveAndInitializePropertiesAsync(file);
 
-			list.Find(x => x.ID == "address").Value =
-				await LocationHelpers.GetAddressFromCoordinatesAsync((double?)list.Find(
-					x => x.Property == "System.GPS.LatitudeDecimal").Value,
-					(double?)list.Find(x => x.Property == "System.GPS.LongitudeDecimal").Value);
+			var addressProperty = list.Find(x => x.ID == "address")
+				?? throw new InvalidOperationException("The file property definitions do not contain the address property.");
+			var latitudeProperty = list.Find(x => x.Property == "System.GPS.LatitudeDecimal")
+				?? throw new InvalidOperationException("The file property definitions do not contain the latitude property.");
+			var longitudeProperty = list.Find(x => x.Property == "System.GPS.LongitudeDecimal")
+				?? throw new InvalidOperationException("The file property definitions do not contain the longitude property.");
+			addressProperty.Value = await LocationHelpers.GetAddressFromCoordinatesAsync(
+				(double?)latitudeProperty.Value,
+				(double?)longitudeProperty.Value);
 
 			var query = list
 				.Where(fileProp => !(fileProp.Value is null && fileProp.IsReadOnly))
-				.GroupBy(fileProp => fileProp.SectionResource)
+				.GroupBy(fileProp => fileProp.SectionResource!)
 				.Select(group => new FilePropertySection(group) { Key = group.Key })
 				.Where(section => !section.All(fileProp => fileProp.Value is null)
 					|| FileProperty.IsSectionApplicableForEmpty(section.Key, Item.FileExtension))
@@ -198,10 +207,10 @@ await LocationHelpers.GetAddressFromCoordinatesAsync((double?)list.Find(
 
 		public async Task SyncPropertyChangesAsync()
 		{
-			BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(Item.ItemPath));
-
 			// Couldn't access the file to save properties
-			if (file is null)
+			var itemPath = Item.GetRequiredPath();
+			var fileResult = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath));
+			if (fileResult.Result is not { } file)
 				return;
 
 			var failedProperties = "";
@@ -212,16 +221,18 @@ public async Task SyncPropertyChangesAsync()
 				{
 					if (!prop.IsReadOnly && prop.Modified)
 					{
-						var newDict = new Dictionary<string, object>
+						var propertyName = prop.Property
+							?? throw new InvalidOperationException("An editable file property does not have an identifier.");
+						var newDict = new Dictionary<string, object?>
 						{
-							{ prop.Property, prop.Value }
+							{ propertyName, prop.Value }
 						};
 
 						try
 						{
 							if (file.Properties is not null)
 							{
-								await file.Properties.SavePropertiesAsync(newDict);
+								await file.Properties.SaveNullablePropertiesAsync(newDict);
 							}
 						}
 						catch
@@ -241,9 +252,9 @@ public async Task SyncPropertyChangesAsync()
 		public async Task ClearPropertiesAsync()
 		{
 			var failedProperties = new List<string>();
-			BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(Item.ItemPath));
-
-			if (file is null)
+			var itemPath = Item.GetRequiredPath();
+			var fileResult = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath));
+			if (fileResult.Result is not { } file)
 				return;
 
 			foreach (var group in ViewModel.PropertySections)
@@ -252,16 +263,18 @@ public async Task ClearPropertiesAsync()
 				{
 					if (!prop.IsReadOnly)
 					{
-						var newDict = new Dictionary<string, object>
+						var propertyName = prop.Property
+							?? throw new InvalidOperationException("An editable file property does not have an identifier.");
+						var newDict = new Dictionary<string, object?>
 						{
-							{ prop.Property, null }
+							{ propertyName, null }
 						};
 
 						try
 						{
 							if (file.Properties is not null)
 							{
-								await file.Properties.SavePropertiesAsync(newDict);
+								await file.Properties.SaveNullablePropertiesAsync(newDict);
 							}
 						}
 						catch
@@ -275,17 +288,19 @@ public async Task ClearPropertiesAsync()
 			_ = GetSystemFilePropertiesAsync();
 		}
 
-		private async void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		private async void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
 		{
+			var itemPath = Item.GetRequiredPath();
+
 			switch (e.PropertyName)
 			{
 				case nameof(ViewModel.IsReadOnly):
 					if (ViewModel.IsReadOnly is not null)
 					{
 						if ((bool)ViewModel.IsReadOnly)
-							Win32Helper.SetFileAttribute(Item.ItemPath, System.IO.FileAttributes.ReadOnly);
+							Win32Helper.SetFileAttribute(itemPath, System.IO.FileAttributes.ReadOnly);
 						else
-							Win32Helper.UnsetFileAttribute(Item.ItemPath, System.IO.FileAttributes.ReadOnly);
+							Win32Helper.UnsetFileAttribute(itemPath, System.IO.FileAttributes.ReadOnly);
 					}
 
 					break;
@@ -294,15 +309,15 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 					if (ViewModel.IsHidden is not null)
 					{
 						if ((bool)ViewModel.IsHidden)
-							Win32Helper.SetFileAttribute(Item.ItemPath, System.IO.FileAttributes.Hidden);
+							Win32Helper.SetFileAttribute(itemPath, System.IO.FileAttributes.Hidden);
 						else
-							Win32Helper.UnsetFileAttribute(Item.ItemPath, System.IO.FileAttributes.Hidden);
+							Win32Helper.UnsetFileAttribute(itemPath, System.IO.FileAttributes.Hidden);
 					}
 
 					break;
 
 				case nameof(ViewModel.IsContentCompressed):
-					Win32Helper.SetCompressionAttributeIoctl(Item.ItemPath, ViewModel.IsContentCompressed ?? false);
+					Win32Helper.SetCompressionAttributeIoctl(itemPath, ViewModel.IsContentCompressed ?? false);
 					break;
 
 				case nameof(ViewModel.RunAsAdmin):
@@ -313,7 +328,7 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 					if (string.IsNullOrWhiteSpace(ViewModel.ShortcutItemPath))
 						return;
 
-					await FileOperationsHelpers.CreateOrUpdateLinkAsync(Item.ItemPath, ViewModel.ShortcutItemPath, ViewModel.ShortcutItemArguments, ViewModel.ShortcutItemWorkingDir, ViewModel.RunAsAdmin, ViewModel.ShowWindowCommand);
+					await FileOperationsHelpers.CreateOrUpdateLinkAsync(itemPath, ViewModel.ShortcutItemPath, ViewModel.ShortcutItemArguments, ViewModel.ShortcutItemWorkingDir, ViewModel.RunAsAdmin, ViewModel.ShowWindowCommand);
 
 					break;
 			}
diff --git a/src/Files.App/ViewModels/Properties/Items/FileProperty.cs b/src/Files.App/ViewModels/Properties/Items/FileProperty.cs
index 1018d958cc32..0c3dadf0b718 100644
--- a/src/Files.App/ViewModels/Properties/Items/FileProperty.cs
+++ b/src/Files.App/ViewModels/Properties/Items/FileProperty.cs
@@ -6,6 +6,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 using System.Collections.Concurrent;
+using System.IO;
 using Windows.Storage;
 
 namespace Files.App.ViewModels.Properties
@@ -18,40 +19,42 @@ public sealed partial class FileProperty : ObservableObject
 		/// <summary>
 		/// The name to display
 		/// </summary>
-		public string Name => LocalizedName ?? NameResource.GetLocalizedResource();
+		public string Name => LocalizedName ?? (NameResource
+			?? throw new InvalidOperationException("The file property does not have a name resource."))
+			.GetLocalizedResource();
 
 		/// <summary>
 		/// The name of the string resource for the property name
 		/// </summary>
-		public string NameResource { get; set; }
+		public string? NameResource { get; set; }
 
-		public string LocalizedName { get; set; }
+		public string? LocalizedName { get; set; }
 
 		/// <summary>
 		/// The name of the section to display
 		/// </summary>
-		public string Section
+		public string? Section
 			=> SectionResource?.GetLocalizedResource();
 
 		/// <summary>
 		/// The name of the string resource for the section name
 		/// </summary>
-		public string SectionResource { get; set; }
+		public string? SectionResource { get; set; }
 
 		/// <summary>
 		/// The identifier of the property to get, eg System.Media.Duration
 		/// </summary>
-		public string Property { get; set; }
+		public string? Property { get; set; }
 
 		/// <summary>
 		/// The value of the property
 		/// </summary>
-		public object Value { get; set; }
+		public object? Value { get; set; }
 
 		/// <summary>
 		/// The string value of the property's value
 		/// </summary>
-		public string ValueText
+		public string? ValueText
 		{
 			get => ConvertToString();
 			set
@@ -77,31 +80,31 @@ public string ValueText
 			}
 		}
 
-		public string PlaceholderText { get; set; }
+		public string? PlaceholderText { get; set; }
 
 		/// <summary>
 		/// This function is run on the value of the property before displaying it.
 		/// Also serves as an alternative to the Converter property
 		/// Note: should only be used on read only properties
 		/// </summary>
-		public Func<object, string> DisplayFunction { get; set; }
+		public Func<object, string>? DisplayFunction { get; set; }
 
 		/// <summary>
 		/// The name of the display function to get from the display dictionary
 		/// </summary>
-		public string DisplayFunctionName { get; set; }
+		public string? DisplayFunctionName { get; set; }
 
 		/// <summary>
 		/// The converter used to convert the property to a string, and vice versa if needed
 		/// </summary>
-		public IValueConverter Converter => GetConverter();
+		public IValueConverter? Converter => GetConverter();
 
 		public bool IsReadOnly { get; set; } = true;
 
 		/// <summary>
 		/// Should be used in instances where a property does not have a "Property" value, but needs to be idenitfiable in a list of properties
 		/// </summary>
-		public string ID { get; set; }
+		public string? ID { get; set; }
 
 		/// <summary>
 		/// True if the property accepts multiple lines of text (e.g., System.Comment)
@@ -121,7 +124,7 @@ public string ValueText
 		/// If a property has an enumerated list of strings to display, add a dictionary in the JSON file that has the number as it's key
 		/// and the string resource as its value
 		/// </summary>
-		public Dictionary<int, string> EnumeratedList { get; set; }
+		public Dictionary<int, string>? EnumeratedList { get; set; }
 
 		public FileProperty()
 		{
@@ -150,8 +153,7 @@ public FileProperty(string property, string nameResource, string sectionResource
 		/// </summary>
 		public void InitializeProperty()
 		{
-			Func<object, string> displayFunction;
-			if (!string.IsNullOrEmpty(DisplayFunctionName) && DisplayFuncs.TryGetValue(DisplayFunctionName, out displayFunction))
+			if (!string.IsNullOrEmpty(DisplayFunctionName) && DisplayFuncs.TryGetValue(DisplayFunctionName, out var displayFunction))
 			{
 				DisplayFunction = displayFunction;
 			}
@@ -168,13 +170,17 @@ public Task SaveValueToFile(BaseStorageFile file)
 			{
 				return Task.CompletedTask;
 			}
+			if (Property is null)
+				throw new InvalidOperationException("The file property does not have a property identifier.");
+			var converter = Converter
+				?? throw new InvalidOperationException("The file property does not have a value converter.");
 
-			var propsToSave = new Dictionary<string, object>
+			var propsToSave = new Dictionary<string, object?>
 			{
-				{ Property, Converter.ConvertBack(Value, null, null, null) }
+				{ Property, converter.ConvertBack(Value, null, null, null) }
 			};
 
-			return file.Properties.SavePropertiesAsync(propsToSave).AsTask();
+			return file.Properties.SaveNullablePropertiesAsync(propsToSave).AsTask();
 		}
 
 		/// <summary>
@@ -189,7 +195,7 @@ public void UpdateValueText()
 		/// Call this function just after getting properties to set the property's converter based on the value type.
 		/// For some reason, this does not work for arrays. In the case of arrays, override the converter
 		/// </summary>
-		private IValueConverter GetConverter()
+		private IValueConverter? GetConverter()
 		{
 			if (Value is uint)
 			{
@@ -208,12 +214,12 @@ private IValueConverter GetConverter()
 
 			if (Value is not null && Value.GetType().IsArray)
 			{
-				if (Value.GetType().GetElementType().Equals(typeof(string)))
+				if (Value.GetType().GetElementType() == typeof(string))
 				{
 					return new StringArrayToStringConverter();
 				}
 
-				if (Value.GetType().GetElementType().Equals(typeof(double)))
+				if (Value.GetType().GetElementType() == typeof(double))
 				{
 					return new DoubleArrayToStringConverter();
 				}
@@ -271,7 +277,7 @@ private IValueConverter GetConverter()
 		/// </summary>
 		/// <param name="value">The input string</param>
 		/// <returns></returns>
-		private object ConvertBack(string value)
+		private object? ConvertBack(string? value)
 		{
 			if (Converter is not null && value is not null)
 			{
@@ -297,15 +303,15 @@ private object ConvertBack(string value)
 		public async static Task<List<FileProperty>> RetrieveAndInitializePropertiesAsync(BaseStorageFile file, string path = Constants.ResourceFilePaths.DetailsPagePropertiesJsonPath)
 		{
 			// cache the contents of the file to avoid repeatedly reading the file
-			string text;
-			if (!cachedPropertiesListFiles.TryGetValue(path, out text))
+			if (!cachedPropertiesListFiles.TryGetValue(path, out var text))
 			{
 				var propertiesJsonFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri(path));
 				text = await FileIO.ReadTextAsync(propertiesJsonFile);
 				cachedPropertiesListFiles[path] = text;
 			}
 
-			List<FileProperty> list = JsonSerializer.Deserialize<List<FileProperty>>(text);
+			List<FileProperty> list = JsonSerializer.Deserialize<List<FileProperty>>(text)
+				?? throw new InvalidDataException($"The property definition file '{path}' does not contain a property list.");
 
 			var propsToGet = new List<string>();
 
@@ -319,10 +325,10 @@ public async static Task<List<FileProperty>> RetrieveAndInitializePropertiesAsyn
 
 #if DEBUG
 			// This makes it much easier to debug issues with the property list
-			var keyValuePairs = new Dictionary<string, object>();
+			var keyValuePairs = new Dictionary<string, object?>();
 			foreach (var prop in propsToGet)
 			{
-				object val = null;
+				object? val = null;
 				try
 				{
 					if (file.Properties is not null)
@@ -337,18 +343,20 @@ public async static Task<List<FileProperty>> RetrieveAndInitializePropertiesAsyn
 				keyValuePairs.Add(prop, val);
 			}
 #else
-            IDictionary<string, object> keyValuePairs = new Dictionary<string, object>();
-            if (file.Properties is not null)
-            {
-                keyValuePairs = await file.Properties.RetrievePropertiesAsync(propsToGet);
-            }
+			IDictionary<string, object?> keyValuePairs = new Dictionary<string, object?>();
+			if (file.Properties is not null)
+			{
+				keyValuePairs = (await file.Properties.RetrievePropertiesAsync(propsToGet))
+					.ToDictionary(pair => pair.Key, pair => (object?)pair.Value);
+			}
 #endif
 
 			foreach (var prop in list)
 			{
 				if (!string.IsNullOrEmpty(prop.Property))
 				{
-					prop.Value = keyValuePairs[prop.Property];
+					keyValuePairs.TryGetValue(prop.Property, out var value);
+					prop.Value = value;
 				}
 
 				prop.InitializeProperty();
@@ -357,7 +365,7 @@ public async static Task<List<FileProperty>> RetrieveAndInitializePropertiesAsyn
 			return list;
 		}
 
-		public static bool IsSectionApplicableForEmpty(string sectionResource, string fileExtension)
+		public static bool IsSectionApplicableForEmpty(string? sectionResource, string? fileExtension)
 		{
 			return sectionResource switch
 			{
diff --git a/src/Files.App/ViewModels/Properties/Items/FilePropertySection.cs b/src/Files.App/ViewModels/Properties/Items/FilePropertySection.cs
index 2bcd674810f4..9d81eca58de9 100644
--- a/src/Files.App/ViewModels/Properties/Items/FilePropertySection.cs
+++ b/src/Files.App/ViewModels/Properties/Items/FilePropertySection.cs
@@ -14,13 +14,15 @@ public FilePropertySection(IEnumerable<FileProperty> items)
 
 		public Visibility Visibility { get; set; }
 
-		public string Key { get; set; }
+		public string? Key { get; set; }
 
 		public string Title
-			=> Key.GetLocalizedResource();
+			=> (Key ?? throw new InvalidOperationException("The property section key has not been initialized.")).GetLocalizedResource();
 
 		public int Priority
-			=> sectionPriority.TryGetValue(Key, out int priority) ? priority : 0;
+			=> Key is null
+				? throw new InvalidOperationException("The property section key has not been initialized.")
+				: sectionPriority.TryGetValue(Key, out int priority) ? priority : 0;
 
 		/// <summary>
 		/// This list sets the priorities for the sections
diff --git a/src/Files.App/ViewModels/Properties/Items/FolderProperties.cs b/src/Files.App/ViewModels/Properties/Items/FolderProperties.cs
index dcabf9d1e989..da210cb8990a 100644
--- a/src/Files.App/ViewModels/Properties/Items/FolderProperties.cs
+++ b/src/Files.App/ViewModels/Properties/Items/FolderProperties.cs
@@ -20,12 +20,9 @@ public FolderProperties(
 			DispatcherQueue coreDispatcher,
 			ListedItem item,
 			IShellPage instance)
+			: base(viewModel, tokenSource, coreDispatcher, instance)
 		{
-			ViewModel = viewModel;
-			TokenSource = tokenSource;
-			Dispatcher = coreDispatcher;
 			Item = item;
-			AppInstance = instance;
 
 			GetBaseProperties();
 
@@ -34,53 +31,54 @@ public FolderProperties(
 
 		public override void GetBaseProperties()
 		{
-			if (Item is not null)
+			var itemPath = Item.GetRequiredPath();
+			ViewModel.ItemName = Item.Name;
+			ViewModel.OriginalItemName = Item.Name;
+			ViewModel.ItemType = Item.ItemType;
+			ViewModel.ItemLocation = (Item as RecycleBinItem)?.ItemOriginalFolder ??
+				(Path.IsPathRooted(itemPath) ? Path.GetDirectoryName(itemPath) : itemPath);
+			ViewModel.ItemModifiedTimestampReal = Item.ItemDateModifiedReal;
+			ViewModel.ItemCreatedTimestampReal = Item.ItemDateCreatedReal;
+			ViewModel.LoadCustomIcon = Item.LoadCustomIcon;
+			ViewModel.CustomIconSource = Item.CustomIconSource;
+			ViewModel.LoadFileIcon = Item.LoadFileIcon;
+			ViewModel.ContainsFilesOrFolders = Item.ContainsFilesOrFolders;
+
+			if (Item.IsShortcut && Item is IShortcutItem shortcutItem)
 			{
-				ViewModel.ItemName = Item.Name;
-				ViewModel.OriginalItemName = Item.Name;
-				ViewModel.ItemType = Item.ItemType;
-				ViewModel.ItemLocation = (Item as RecycleBinItem)?.ItemOriginalFolder ??
-					(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath);
-				ViewModel.ItemModifiedTimestampReal = Item.ItemDateModifiedReal;
-				ViewModel.ItemCreatedTimestampReal = Item.ItemDateCreatedReal;
-				ViewModel.LoadCustomIcon = Item.LoadCustomIcon;
-				ViewModel.CustomIconSource = Item.CustomIconSource;
-				ViewModel.LoadFileIcon = Item.LoadFileIcon;
-				ViewModel.ContainsFilesOrFolders = Item.ContainsFilesOrFolders;
-
-				if (Item.IsShortcut && Item is IShortcutItem shortcutItem)
+				ViewModel.ShortcutItemType = Strings.Folder.GetLocalizedResource();
+				ViewModel.ShortcutItemPath = shortcutItem.TargetPath;
+				ViewModel.IsShortcutItemPathReadOnly = false;
+				ViewModel.ShortcutItemWorkingDir = shortcutItem.WorkingDirectory;
+				ViewModel.ShowWindowCommand = shortcutItem.ShowWindowCommand;
+				ViewModel.ShortcutItemWorkingDirVisibility = false;
+				ViewModel.ShortcutItemArguments = shortcutItem.Arguments;
+				ViewModel.ShortcutItemArgumentsVisibility = false;
+				ViewModel.ShortcutItemWindowArgsVisibility = false;
+				ViewModel.ShortcutItemOpenLinkCommand = new RelayCommand(async () =>
 				{
-					ViewModel.ShortcutItemType = Strings.Folder.GetLocalizedResource();
-					ViewModel.ShortcutItemPath = shortcutItem.TargetPath;
-					ViewModel.IsShortcutItemPathReadOnly = false;
-					ViewModel.ShortcutItemWorkingDir = shortcutItem.WorkingDirectory;
-					ViewModel.ShowWindowCommand = shortcutItem.ShowWindowCommand;
-					ViewModel.ShortcutItemWorkingDirVisibility = false;
-					ViewModel.ShortcutItemArguments = shortcutItem.Arguments;
-					ViewModel.ShortcutItemArgumentsVisibility = false;
-					ViewModel.ShortcutItemWindowArgsVisibility = false;
-					ViewModel.ShortcutItemOpenLinkCommand = new RelayCommand(async () =>
-					{
-						await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(
-							() => NavigationHelpers.OpenPathInNewTab(Path.GetDirectoryName(Environment.ExpandEnvironmentVariables(ViewModel.ShortcutItemPath)), true));
-					},
-					() =>
-					{
-						return !string.IsNullOrWhiteSpace(ViewModel.ShortcutItemPath);
-					});
-				}
+					var shortcutPath = ViewModel.ShortcutItemPath
+						?? throw new InvalidOperationException("The shortcut does not have a target path.");
+					await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(
+						() => NavigationHelpers.OpenPathInNewTab(Path.GetDirectoryName(Environment.ExpandEnvironmentVariables(shortcutPath)), true));
+				},
+				() =>
+				{
+					return !string.IsNullOrWhiteSpace(ViewModel.ShortcutItemPath);
+				});
 			}
 		}
 
 		public async override Task GetSpecialPropertiesAsync()
 		{
-			var fileAttributes = Win32Helper.GetFileAttributes(Item.ItemPath);
+			var itemPath = Item.GetRequiredPath();
+			var fileAttributes = Win32Helper.GetFileAttributes(itemPath);
 			ViewModel.IsHidden = fileAttributes.HasFlag(FileAttributes.Hidden);
-			ViewModel.CanCompressContent = Win32Helper.CanCompressContent(Item.ItemPath);
+			ViewModel.CanCompressContent = Win32Helper.CanCompressContent(itemPath);
 			ViewModel.IsContentCompressed = fileAttributes.HasFlag(FileAttributes.Compressed);
 
 			var result = await FileThumbnailHelper.GetIconAsync(
-				Item.ItemPath,
+				itemPath,
 				Constants.ShellIconSizes.ExtraLarge,
 				true,
 				IconOptions.UseCurrentScale);
@@ -99,7 +97,7 @@ public async override Task GetSpecialPropertiesAsync()
 
 				// Only load the size for items on the device
 				if (Item.SyncStatusUI.SyncStatus is not CloudDriveSyncStatus.FileOnline and not CloudDriveSyncStatus.FolderOnline)
-					ViewModel.ItemSizeOnDisk = Win32Helper.GetFileSizeOnDisk(Item.ItemPath)?.ToLongSizeString() ??
+					ViewModel.ItemSizeOnDisk = Win32Helper.GetFileSizeOnDisk(itemPath)?.ToLongSizeString() ??
 					   string.Empty;
 
 				ViewModel.ItemCreatedTimestampReal = Item.ItemDateCreatedReal;
@@ -111,8 +109,11 @@ public async override Task GetSpecialPropertiesAsync()
 				}
 			}
 
-			string folderPath = (Item as IShortcutItem)?.TargetPath ?? Item.ItemPath;
-			BaseStorageFolder storageFolder = await AppInstance.ShellViewModel.GetFolderFromPathAsync(folderPath);
+			var targetPath = (Item as IShortcutItem)?.TargetPath;
+			string folderPath = !string.IsNullOrEmpty(targetPath) ? targetPath : Item.GetRequiredPath();
+			var shellViewModel = AppInstance.GetRequiredShellViewModel();
+
+			var storageFolder = (await shellViewModel.GetFolderFromPathAsync(folderPath)).Result;
 
 			if (storageFolder is not null)
 			{
@@ -126,7 +127,7 @@ CloudDriveSyncStatus.FolderOnline and not
 					CloudDriveSyncStatus.FolderOfflinePartial)
 					_ = GetFolderSizeAsync(storageFolder.Path, TokenSource.Token);
 			}
-			else if (Item.ItemPath.Equals(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
+			else if (string.Equals(Item.ItemPath, Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
 			{
 				var recycleBinQuery = StorageTrashBinService.QueryRecycleBin();
 				if (recycleBinQuery.BinSize is long binSize)
@@ -200,22 +201,23 @@ private async Task GetFolderSizeAsync(string folderPath, CancellationToken token
 			SetItemsCountString();
 		}
 
-		private async void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		private async void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
 		{
+			var itemPath = Item.GetRequiredPath();
 			switch (e.PropertyName)
 			{
 				case nameof(ViewModel.IsHidden):
 					if (ViewModel.IsHidden is not null)
 					{
 						if ((bool)ViewModel.IsHidden)
-							Win32Helper.SetFileAttribute(Item.ItemPath, System.IO.FileAttributes.Hidden);
+							Win32Helper.SetFileAttribute(itemPath, System.IO.FileAttributes.Hidden);
 						else
-							Win32Helper.UnsetFileAttribute(Item.ItemPath, System.IO.FileAttributes.Hidden);
+							Win32Helper.UnsetFileAttribute(itemPath, System.IO.FileAttributes.Hidden);
 					}
 					break;
 
 				case nameof(ViewModel.IsContentCompressed):
-					Win32Helper.SetCompressionAttributeIoctl(Item.ItemPath, ViewModel.IsContentCompressed ?? false);
+					Win32Helper.SetCompressionAttributeIoctl(itemPath, ViewModel.IsContentCompressed ?? false);
 					break;
 
 				case nameof(ViewModel.ShortcutItemPath):
@@ -227,7 +229,7 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 					if (string.IsNullOrWhiteSpace(ViewModel.ShortcutItemPath))
 						return;
 
-					await FileOperationsHelpers.CreateOrUpdateLinkAsync(Item.ItemPath, ViewModel.ShortcutItemPath, ViewModel.ShortcutItemArguments, ViewModel.ShortcutItemWorkingDir, shortcutItem.RunAsAdmin, ViewModel.ShowWindowCommand);
+					await FileOperationsHelpers.CreateOrUpdateLinkAsync(itemPath, ViewModel.ShortcutItemPath, ViewModel.ShortcutItemArguments, ViewModel.ShortcutItemWorkingDir, shortcutItem.RunAsAdmin, ViewModel.ShowWindowCommand);
 					break;
 			}
 		}
diff --git a/src/Files.App/ViewModels/Properties/Items/LibraryProperties.cs b/src/Files.App/ViewModels/Properties/Items/LibraryProperties.cs
index e21f5b30b833..30d9ac889354 100644
--- a/src/Files.App/ViewModels/Properties/Items/LibraryProperties.cs
+++ b/src/Files.App/ViewModels/Properties/Items/LibraryProperties.cs
@@ -12,12 +12,9 @@ internal sealed class LibraryProperties : BaseProperties
 
 		public LibraryProperties(SelectedItemsPropertiesViewModel viewModel, CancellationTokenSource tokenSource,
 			DispatcherQueue coreDispatcher, LibraryItem item, IShellPage instance)
+			: base(viewModel, tokenSource, coreDispatcher, instance)
 		{
-			ViewModel = viewModel;
-			TokenSource = tokenSource;
-			Dispatcher = coreDispatcher;
 			Library = item;
-			AppInstance = instance;
 
 			GetBaseProperties();
 			ViewModel.PropertyChanged += ViewModel_PropertyChanged;
@@ -46,13 +43,14 @@ public override void GetBaseProperties()
 
 		public async override Task GetSpecialPropertiesAsync()
 		{
-			var fileAttributes = Win32Helper.GetFileAttributes(Library.ItemPath);
+			var libraryPath = Library.GetRequiredPath();
+			var fileAttributes = Win32Helper.GetFileAttributes(libraryPath);
 			ViewModel.IsReadOnly = fileAttributes.HasFlag(System.IO.FileAttributes.ReadOnly);
 			ViewModel.IsHidden = fileAttributes.HasFlag(System.IO.FileAttributes.Hidden);
 			ViewModel.CanCompressContent = false;
 
 			var result = await FileThumbnailHelper.GetIconAsync(
-				Library.ItemPath,
+				libraryPath,
 				Constants.ShellIconSizes.ExtraLarge,
 				true,
 				IconOptions.UseCurrentScale);
@@ -64,7 +62,9 @@ public async override Task GetSpecialPropertiesAsync()
 				ViewModel.LoadFileIcon = true;
 			}
 
-			BaseStorageFile libraryFile = await AppInstance.ShellViewModel.GetFileFromPathAsync(Library.ItemPath);
+			var shellViewModel = AppInstance.GetRequiredShellViewModel();
+
+			BaseStorageFile? libraryFile = Library.ItemPath is null ? null : (await shellViewModel.GetFileFromPathAsync(Library.ItemPath)).Result;
 			if (libraryFile is not null)
 			{
 				ViewModel.ItemCreatedTimestampReal = libraryFile.DateCreated;
@@ -81,7 +81,8 @@ public async override Task GetSpecialPropertiesAsync()
 				{
 					foreach (var path in Library.Folders)
 					{
-						BaseStorageFolder folder = await AppInstance.ShellViewModel.GetFolderFromPathAsync(path);
+						var folder = (await shellViewModel.GetFolderFromPathAsync(path)).Result
+							?? throw new InvalidOperationException($"The library folder '{path}' could not be opened.");
 						if (!string.IsNullOrEmpty(folder.Path))
 						{
 							storageFolders.Add(folder);
@@ -138,17 +139,18 @@ private async Task GetLibrarySizeAsync(List<BaseStorageFolder> storageFolders, C
 			SetItemsCountString();
 		}
 
-		private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
 		{
+			var libraryPath = Library.GetRequiredPath();
 			switch (e.PropertyName)
 			{
 				case "IsReadOnly":
 					if (ViewModel.IsReadOnly is not null)
 					{
 						if ((bool)ViewModel.IsReadOnly)
-							Win32Helper.SetFileAttribute(Library.ItemPath, System.IO.FileAttributes.ReadOnly);
+							Win32Helper.SetFileAttribute(libraryPath, System.IO.FileAttributes.ReadOnly);
 						else
-							Win32Helper.UnsetFileAttribute(Library.ItemPath, System.IO.FileAttributes.ReadOnly);
+							Win32Helper.UnsetFileAttribute(libraryPath, System.IO.FileAttributes.ReadOnly);
 					}
 
 					break;
@@ -157,9 +159,9 @@ private void ViewModel_PropertyChanged(object sender, System.ComponentModel.Prop
 					if (ViewModel.IsHidden is not null)
 					{
 						if ((bool)ViewModel.IsHidden)
-							Win32Helper.SetFileAttribute(Library.ItemPath, System.IO.FileAttributes.Hidden);
+							Win32Helper.SetFileAttribute(libraryPath, System.IO.FileAttributes.Hidden);
 						else
-							Win32Helper.UnsetFileAttribute(Library.ItemPath, System.IO.FileAttributes.Hidden);
+							Win32Helper.UnsetFileAttribute(libraryPath, System.IO.FileAttributes.Hidden);
 					}
 
 					break;
diff --git a/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs b/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs
index c5a33a860005..971ed96f5e32 100644
--- a/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs
+++ b/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs
@@ -55,11 +55,13 @@ public MainPropertiesViewModel(Window window, Frame mainFrame, BaseProperties ba
 			SaveChangedPropertiesCommand = new AsyncRelayCommand(ExecuteSaveChangedPropertiesCommandAsync);
 			CancelChangedPropertiesCommand = new RelayCommand(ExecuteCancelChangedPropertiesCommand);
 
-			NavigationItems = PropertiesNavigationItemsFactory.Initialize(parameter.Parameter);
+			NavigationItems = PropertiesNavigationItemsFactory.Initialize(parameter.Parameter
+				?? throw new InvalidOperationException("The properties parameter does not contain an item."));
 			foreach (var navItem in NavigationItems)
 				FlatNavigationItems.Add(new FlatSidebarItem(navItem, 0));
 
-			SelectedNavigationItem = NavigationItems.First(x => x.ItemType == PropertiesNavigationViewItemType.General);
+			_SelectedNavigationItem = NavigationItems.First(x => x.ItemType == PropertiesNavigationViewItemType.General);
+			NavigateToPage(_SelectedNavigationItem);
 		}
 
 		private void NavigateToPage(PropertiesNavigationItem item)
@@ -138,7 +140,7 @@ private async Task ApplyChangesAsync()
 		}
 	}
 
-	public sealed partial class PropertiesNavigationItem : ObservableObject, ISidebarItemModel
+	public sealed partial class PropertiesNavigationItem : ObservableObject, ISidebarItemModel, ISidebarItemPresentationModel
 	{
 		public PropertiesNavigationViewItemType ItemType { get; }
 		public string Text { get; }
@@ -150,6 +152,8 @@ public sealed partial class PropertiesNavigationItem : ObservableObject, ISideba
 
 		public object? ToolTip => Text;
 		public object? ItemDecorator => null;
+		FrameworkElement ISidebarItemPresentationModel.IconElement => IconElement;
+		FrameworkElement? ISidebarItemPresentationModel.ItemDecorator => null;
 
 		public PropertiesNavigationItem(PropertiesNavigationViewItemType itemType, string text, ThemedIcon iconElement)
 		{
diff --git a/src/Files.App/ViewModels/Properties/SecurityAdvancedViewModel.cs b/src/Files.App/ViewModels/Properties/SecurityAdvancedViewModel.cs
index 367e8b4aaee5..10f0b7f91a17 100644
--- a/src/Files.App/ViewModels/Properties/SecurityAdvancedViewModel.cs
+++ b/src/Files.App/ViewModels/Properties/SecurityAdvancedViewModel.cs
@@ -50,10 +50,11 @@ public string DisableInheritanceOption
 			}
 		}
 
-		private AccessControlList _AccessControlList;
+		private AccessControlList? _AccessControlList;
 		public AccessControlList AccessControlList
 		{
-			get => _AccessControlList;
+			get => _AccessControlList
+				?? throw new InvalidOperationException("The access control list has not been loaded.");
 			set => SetProperty(ref _AccessControlList, value);
 		}
 
@@ -126,27 +127,25 @@ public GridLength ColumnInheritedGridLength
 		public SecurityAdvancedViewModel(PropertiesPageNavigationParameter parameter)
 		{
 			_navigationParameter = parameter;
-			_window = parameter.Window;
+			_window = parameter.Window
+				?? throw new InvalidOperationException("The security page does not have an associated window.");
 
 			switch (parameter.Parameter)
 			{
 				case ListedItem listedItem:
-					_path = listedItem.ItemPath;
+					_path = listedItem.GetRequiredPath();
 					_isFolder = listedItem.PrimaryItemAttribute == StorageItemTypes.Folder && !listedItem.IsShortcut;
 					break;
 				case DriveItem driveItem:
-					_path = driveItem.Path;
+					_path = driveItem.GetRequiredPath();
 					_isFolder = true;
 					break;
 				default:
-					var defaultlistedItem = (ListedItem)parameter.Parameter;
-					_path = defaultlistedItem.ItemPath;
-					_isFolder = defaultlistedItem.PrimaryItemAttribute == StorageItemTypes.Folder && !defaultlistedItem.IsShortcut;
-					break;
+					throw new ArgumentException("The security page requires a listed item or drive.", nameof(parameter));
 			}
 			;
 
-			LoadShieldIconResource();
+			ShieldIconFileInfo = LoadShieldIconResource();
 
 			LoadAccessControlEntry();
 
@@ -155,7 +154,7 @@ public SecurityAdvancedViewModel(PropertiesPageNavigationParameter parameter)
 			RemoveAccessControlEntryCommand = new AsyncRelayCommand(ExecuteRemoveAccessControlEntryCommandAsync);
 		}
 
-		private void LoadShieldIconResource()
+		private IconFileInfo LoadShieldIconResource()
 		{
 			string imageres = System.IO.Path.Combine(Constants.UserEnvironmentPaths.SystemRootPath, "System32", "imageres.dll");
 
@@ -164,12 +163,14 @@ private void LoadShieldIconResource()
 				new List<int>() { Constants.ImageRes.ShieldIcon },
 				16);
 
-			ShieldIconFileInfo = imageResList.First();
+			return imageResList.First();
 		}
 
 		private void LoadAccessControlEntry()
 		{
-			var error = StorageSecurityService.GetAcl(_path, _isFolder, out _AccessControlList);
+			var error = StorageSecurityService.GetAcl(_path, _isFolder, out var accessControlList);
+			AccessControlList = accessControlList
+				?? throw new InvalidOperationException("The security service did not return an access control list.");
 			OnPropertyChanged(nameof(AccessControlList));
 
 			SelectedAccessControlEntry = AccessControlList.AccessControlEntries.FirstOrDefault();
diff --git a/src/Files.App/ViewModels/Properties/SecurityViewModel.cs b/src/Files.App/ViewModels/Properties/SecurityViewModel.cs
index 30da282c7d7d..c96c00aff4dd 100644
--- a/src/Files.App/ViewModels/Properties/SecurityViewModel.cs
+++ b/src/Files.App/ViewModels/Properties/SecurityViewModel.cs
@@ -39,10 +39,11 @@ SelectedAccessControlEntry is null
 				? Strings.Permissions.GetLocalizedResource()
 				: string.Format(Strings.SecurityPermissionsHeaderText.GetLocalizedResource(), SelectedAccessControlEntry?.Principal.DisplayName);
 
-		private AccessControlList _AccessControlList;
+		private AccessControlList? _AccessControlList;
 		public AccessControlList AccessControlList
 		{
-			get => _AccessControlList;
+			get => _AccessControlList
+				?? throw new InvalidOperationException("The access control list has not been loaded.");
 			set => SetProperty(ref _AccessControlList, value);
 		}
 
@@ -72,27 +73,27 @@ public AccessControlEntry? SelectedAccessControlEntry
 		public SecurityViewModel(PropertiesPageNavigationParameter parameter)
 		{
 			_navigationParameter = parameter;
-			_window = parameter.Window;
+			_window = parameter.Window
+				?? throw new InvalidOperationException("The security page does not have an associated window.");
 
 			switch (parameter.Parameter)
 			{
 				case ListedItem listedItem:
-					_path = listedItem.ItemPath;
+					_path = listedItem.GetRequiredPath();
 					_isFolder = listedItem.PrimaryItemAttribute == StorageItemTypes.Folder && !listedItem.IsShortcut;
 					break;
 				case DriveItem driveItem:
-					_path = driveItem.Path;
+					_path = driveItem.GetRequiredPath();
 					_isFolder = true;
 					break;
 				default:
-					var defaultlistedItem = (ListedItem)parameter.Parameter;
-					_path = defaultlistedItem.ItemPath;
-					_isFolder = defaultlistedItem.PrimaryItemAttribute == StorageItemTypes.Folder && !defaultlistedItem.IsShortcut;
-					break;
+					throw new ArgumentException("The security page requires a listed item or drive.", nameof(parameter));
 			}
 			;
 
-			var error = StorageSecurityService.GetAcl(_path, _isFolder, out _AccessControlList);
+			var error = StorageSecurityService.GetAcl(_path, _isFolder, out var accessControlList);
+			AccessControlList = accessControlList
+				?? throw new InvalidOperationException("The security service did not return an access control list.");
 			_SelectedAccessControlEntry = AccessControlList.AccessControlEntries.FirstOrDefault();
 
 			if (!AccessControlList.IsValid)
@@ -132,16 +133,21 @@ await MainWindow.Instance.DispatcherQueue.EnqueueAsync(() =>
 
 		private async Task ExecuteRemoveAccessControlEntryCommandAsync()
 		{
+			var selectedEntry = SelectedAccessControlEntry
+				?? throw new InvalidOperationException("No access control entry is selected for removal.");
+
 			await MainWindow.Instance.DispatcherQueue.EnqueueAsync(() =>
 			{
 				// Get index of the ACE
-				var index = AccessControlList.AccessControlEntries.IndexOf(SelectedAccessControlEntry);
+				var index = AccessControlList.AccessControlEntries.IndexOf(selectedEntry);
+				if (index < 0)
+					throw new InvalidOperationException("The selected access control entry is not part of the access control list.");
 
 				// Run Win32API
 				var win32Result = StorageSecurityService.DeleteAce(_path, (uint)index);
 
 				// Remove the ACE
-				AccessControlList.AccessControlEntries.Remove(SelectedAccessControlEntry);
+				AccessControlList.AccessControlEntries.Remove(selectedEntry);
 
 				if (AccessControlList.AccessControlEntries.Count == 0)
 					return;
diff --git a/src/Files.App/ViewModels/Properties/SignaturesViewModel.cs b/src/Files.App/ViewModels/Properties/SignaturesViewModel.cs
index 4dc1200a76e0..fc3addbdb636 100644
--- a/src/Files.App/ViewModels/Properties/SignaturesViewModel.cs
+++ b/src/Files.App/ViewModels/Properties/SignaturesViewModel.cs
@@ -22,7 +22,7 @@ public SignaturesViewModel(ListedItem item, AppWindow appWindow)
 			var hWnd = new HWND(Microsoft.UI.Win32Interop.GetWindowFromWindowId(appWindow.Id));
 			Signatures.CollectionChanged += (s, e) => OnPropertyChanged(nameof(NoSignatureFound));
 			DigitalSignaturesUtil.LoadItemSignatures(
-				item.ItemPath,
+				item.ItemPath!,
 				Signatures,
 				hWnd,
 				_cancellationTokenSource.Token
diff --git a/src/Files.App/ViewModels/Settings/ActionsViewModel.cs b/src/Files.App/ViewModels/Settings/ActionsViewModel.cs
index 6967086783ea..03655b282b87 100644
--- a/src/Files.App/ViewModels/Settings/ActionsViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/ActionsViewModel.cs
@@ -20,8 +20,8 @@ public sealed partial class ActionsViewModel : ObservableObject
 		public ObservableCollection<ModifiableActionItem> ValidActionItems { get; } = [];
 		public ObservableCollection<ModifiableActionItem> AllActionItems { get; } = [];
 
-		private ObservableCollection<ModifiableActionItem> _FilteredActionItems;
-		public ObservableCollection<ModifiableActionItem> FilteredActionItems
+		private ObservableCollection<ModifiableActionItem>? _FilteredActionItems;
+		public ObservableCollection<ModifiableActionItem>? FilteredActionItems
 		{
 			get { return _FilteredActionItems; }
 			set { SetProperty(ref _FilteredActionItems, value); }
@@ -469,4 +469,4 @@ public void FilterItems(string query)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/ViewModels/Settings/AdvancedViewModel.cs b/src/Files.App/ViewModels/Settings/AdvancedViewModel.cs
index f4af5fa50be1..5173fd8f3eee 100644
--- a/src/Files.App/ViewModels/Settings/AdvancedViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/AdvancedViewModel.cs
@@ -160,9 +160,10 @@ private async Task ImportSettingsAsync()
 			try
 			{
 				var file = await StorageHelpers.ToStorageItem<BaseStorageFile>(filePath);
+				if (file is null)
+					throw new IOException($"The selected settings file '{filePath}' could not be read.");
 
-				var zipFolder = await ZipStorageFolder.FromStorageFileAsync(file);
-				if (zipFolder is null)
+				if (await ZipStorageFolder.FromStorageFileAsync(file) is not ZipStorageFolder zipFolder)
 					return;
 
 				var localFolderPath = ApplicationData.Current.LocalFolder.Path;
@@ -220,11 +221,12 @@ private async Task ExportSettingsAsync()
 				Win32PInvoke.CloseHandle(handle);
 
 				var file = await StorageHelpers.ToStorageItem<BaseStorageFile>(filePath);
+				if (file is null)
+					throw new IOException($"The settings export file '{filePath}' could not be opened.");
 
 				await ZipStorageFolder.InitArchive(file, OutArchiveFormat.Zip);
 
-				var zipFolder = (ZipStorageFolder)await ZipStorageFolder.FromStorageFileAsync(file);
-				if (zipFolder is null)
+				if (await ZipStorageFolder.FromStorageFileAsync(file) is not ZipStorageFolder zipFolder)
 					return;
 
 				var localFolderPath = ApplicationData.Current.LocalFolder.Path;
@@ -483,4 +485,4 @@ public async Task<StartupTaskState> ReadState()
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs b/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs
index ba9a7d986dae..9afdbabd820e 100644
--- a/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs
@@ -61,6 +61,7 @@ public AppearanceViewModel(IUserSettingsService userSettingsService, IResourcesS
 			selectedBackdropMaterial = BackdropMaterialTypes[UserSettingsService.AppearanceSettingsService.AppThemeBackdropMaterial];
 
 			AppThemeResources = AppThemeResourceFactory.AppThemeResources;
+			selectedAppThemeResources = AppThemeResources[0];
 
 
 			// Background image fit options
@@ -190,7 +191,7 @@ public AppThemeResourceItem SelectedAppThemeResources
 			{
 				if (value is not null && SetProperty(ref selectedAppThemeResources, value))
 				{
-					AppThemeBackgroundColor = SelectedAppThemeResources.BackgroundColor;
+					AppThemeBackgroundColor = value.BackgroundColor!;
 					OnPropertyChanged(nameof(selectedAppThemeResources));
 				}
 			}
@@ -296,7 +297,7 @@ public string AppThemeBackgroundImageSource
 			}
 		}
 
-		private string selectedImageStretchType;
+		private string selectedImageStretchType = null!;
 		public string SelectedImageStretchType
 		{
 			get => selectedImageStretchType;
@@ -323,7 +324,7 @@ public float AppThemeBackgroundImageOpacity
 			}
 		}
 
-		private string selectedImageVerticalAlignmentType;
+		private string selectedImageVerticalAlignmentType = null!;
 		public string SelectedImageVerticalAlignmentType
 		{
 			get => selectedImageVerticalAlignmentType;
@@ -336,7 +337,7 @@ public string SelectedImageVerticalAlignmentType
 			}
 		}
 
-		private string selectedImageHorizontalAlignmentType;
+		private string selectedImageHorizontalAlignmentType = null!;
 		public string SelectedImageHorizontalAlignmentType
 		{
 			get => selectedImageHorizontalAlignmentType;
@@ -405,7 +406,7 @@ public bool ShowShelfPaneToggleButton
 			}
 		}
 
-		private string selectedStatusCenterVisibilityOption;
+		private string selectedStatusCenterVisibilityOption = null!;
 		public string SelectedStatusCenterVisibilityOption
 		{
 			get => selectedStatusCenterVisibilityOption;
diff --git a/src/Files.App/ViewModels/Settings/DevToolsViewModel.cs b/src/Files.App/ViewModels/Settings/DevToolsViewModel.cs
index 75fda57a8da9..d503a071d65e 100644
--- a/src/Files.App/ViewModels/Settings/DevToolsViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/DevToolsViewModel.cs
@@ -53,7 +53,7 @@ public bool IsIDENameValid
 			set => SetProperty(ref _IsIDENameValid, value);
 		}
 
-		private string _IDEPath;
+		private string _IDEPath = null!;
 		public string IDEPath
 		{
 			get => _IDEPath;
@@ -72,7 +72,7 @@ public string IDEPath
 			}
 		}
 
-		private string _IDEName;
+		private string _IDEName = null!;
 		public string IDEName
 		{
 			get => _IDEName;
@@ -109,7 +109,7 @@ public DevToolsViewModel()
 			TestIDECommand = new RelayCommand(DoTestIDE);
 		}
 
-		private string selectedOpenInIDEOption;
+		private string selectedOpenInIDEOption = null!;
 		public string SelectedOpenInIDEOption
 		{
 			get => selectedOpenInIDEOption;
diff --git a/src/Files.App/ViewModels/Settings/FoldersViewModel.cs b/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
index 22838e7157c1..c2c0deb80bff 100644
--- a/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
@@ -103,7 +103,7 @@ public bool ShowDotFiles
 			}
 		}
 
-		private string selectedOpenFilesWithSingleClickOption;
+		private string selectedOpenFilesWithSingleClickOption = null!;
 		public string SelectedOpenFilesWithSingleClickOption
 		{
 			get => selectedOpenFilesWithSingleClickOption;
@@ -116,7 +116,7 @@ public string SelectedOpenFilesWithSingleClickOption
 			}
 		}
 
-		private string selectedOpenFoldersWithSingleClickOption;
+		private string selectedOpenFoldersWithSingleClickOption = null!;
 		public string SelectedOpenFoldersWithSingleClickOption
 		{
 			get => selectedOpenFoldersWithSingleClickOption;
@@ -129,7 +129,7 @@ public string SelectedOpenFoldersWithSingleClickOption
 			}
 		}
 
-		private string selectedOpenFoldersInColumnsViewWithSingleClickOption;
+		private string selectedOpenFoldersInColumnsViewWithSingleClickOption = null!;
 		public string SelectedOpenFoldersInColumnsViewWithSingleClickOption
 		{
 			get => selectedOpenFoldersInColumnsViewWithSingleClickOption;
@@ -282,7 +282,7 @@ public bool ShowCheckboxesWhenSelectingItems
 			}
 		}
 
-		private string sizeUnitFormat;
+		private string sizeUnitFormat = null!;
 		public string SizeUnitFormat
 		{
 			get => sizeUnitFormat;
diff --git a/src/Files.App/ViewModels/Settings/GeneralViewModel.cs b/src/Files.App/ViewModels/Settings/GeneralViewModel.cs
index db6160d96f93..e247b5b4cce6 100644
--- a/src/Files.App/ViewModels/Settings/GeneralViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/GeneralViewModel.cs
@@ -16,7 +16,7 @@ public sealed partial class GeneralViewModel : ObservableObject, IDisposable
 
 		private bool disposed;
 
-		private ReadOnlyCollection<IMenuFlyoutItemViewModel> addFlyoutItemsSource;
+		private ReadOnlyCollection<IMenuFlyoutItemViewModel>? addFlyoutItemsSource;
 
 		public RelayCommand ChangePageCommand { get; }
 		public RelayCommand<PageOnStartupViewModel> RemovePageCommand { get; }
@@ -78,7 +78,7 @@ public int SelectedAppLanguageIndex
 			}
 		}
 
-		public List<DateTimeFormatItem> DateFormats { get; set; }
+		public List<DateTimeFormatItem> DateFormats { get; set; } = null!;
 
 		public ObservableCollection<AppLanguageItem> AppLanguages => AppLanguageHelper.SupportedLanguages;
 
@@ -156,7 +156,7 @@ private void InitStartupSettingsRecentFoldersFlyout()
 			recentsItem.Items.Add(new MenuFlyoutItemViewModel(Strings.Browse.GetLocalizedResource()) { Command = AddPageCommand });
 		}
 
-		private void PagesOnStartupList_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		private void PagesOnStartupList_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
 		{
 			if (PagesOnStartupList.Count > 0)
 				UserSettingsService.GeneralSettingsService.TabsOnStartupList = PagesOnStartupList.Select((p) => p.Path).ToList();
@@ -210,7 +210,7 @@ public bool OpenASpecificPageOnStartup
 
 		public ObservableCollection<PageOnStartupViewModel> PagesOnStartupList { get; set; }
 
-		public ReadOnlyCollection<IMenuFlyoutItemViewModel> AddFlyoutItemsSource
+		public ReadOnlyCollection<IMenuFlyoutItemViewModel>? AddFlyoutItemsSource
 		{
 			get => addFlyoutItemsSource;
 			set => SetProperty(ref addFlyoutItemsSource, value);
@@ -353,12 +353,13 @@ private void ChangePageAsync()
 				PagesOnStartupList[SelectedPageIndex] = new PageOnStartupViewModel(filePath);
 		}
 
-		private void RemovePage(PageOnStartupViewModel page)
+		private void RemovePage(PageOnStartupViewModel? page)
 		{
-			PagesOnStartupList.Remove(page);
+			if (page is not null)
+				PagesOnStartupList.Remove(page);
 		}
 
-		private async Task AddPageAsync(string path = null)
+		private async Task AddPageAsync(string? path = null)
 		{
 			if (string.IsNullOrWhiteSpace(path))
 			{
@@ -575,7 +576,7 @@ public bool ShowOpenTerminal
 			}
 		}
 
-		private string selectedShellPaneArrangementType;
+		private string selectedShellPaneArrangementType = null!;
 		public string SelectedShellPaneArrangementType
 		{
 			get => selectedShellPaneArrangementType;
diff --git a/src/Files.App/ViewModels/Settings/SettingsPageViewModel.cs b/src/Files.App/ViewModels/Settings/SettingsPageViewModel.cs
index e09b11ba1696..9625add42cbe 100644
--- a/src/Files.App/ViewModels/Settings/SettingsPageViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/SettingsPageViewModel.cs
@@ -106,7 +106,7 @@ private static SettingsNavigationItem CreateNavigationItem(SettingsPageKind page
 		}
 	}
 
-	public sealed partial class SettingsNavigationItem : ObservableObject, ISidebarItemModel
+	public sealed partial class SettingsNavigationItem : ObservableObject, ISidebarItemModel, ISidebarItemPresentationModel
 	{
 		public SettingsPageKind PageKind { get; }
 		public string AutomationId { get; }
@@ -118,9 +118,11 @@ public sealed partial class SettingsNavigationItem : ObservableObject, ISidebarI
 		public string? Path => null;
 		[ObservableProperty] public partial bool IsExpanded { get; set; }
 
-		// DefaultSidebarItemTemplate bindings
+		// Sidebar presentation
 		public object? ToolTip => Text;
 		public object? ItemDecorator => null;
+		FrameworkElement ISidebarItemPresentationModel.IconElement => IconElement;
+		FrameworkElement? ISidebarItemPresentationModel.ItemDecorator => null;
 
 		public SettingsNavigationItem(SettingsPageKind pageKind, string automationId, string text, ThemedIcon iconElement)
 		{
diff --git a/src/Files.App/ViewModels/ShellViewModel.cs b/src/Files.App/ViewModels/ShellViewModel.cs
index 47cbfc458de9..9b7d9c0ba10e 100644
--- a/src/Files.App/ViewModels/ShellViewModel.cs
+++ b/src/Files.App/ViewModels/ShellViewModel.cs
@@ -10,6 +10,7 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -67,7 +68,7 @@ public sealed partial class ShellViewModel : ObservableObject, IDisposable
 		// Only used for Binding and ApplyFilesAndFoldersChangesAsync, don't manipulate on this!
 		public BulkConcurrentObservableCollection<ListedItem> FilesAndFolders { get; }
 
-		private LayoutPreferencesManager folderSettings = null;
+		private readonly LayoutPreferencesManager folderSettings;
 
 		private ListedItem? currentFolder;
 		public ListedItem? CurrentFolder
@@ -160,51 +161,51 @@ public GitProperties EnabledGitProperties
 			}
 		}
 
-		public CollectionViewSource viewSource;
+		public CollectionViewSource? viewSource;
 
-		private FileSystemWatcher watcher;
+		private FileSystemWatcher? watcher;
 
-		private static BitmapImage shieldIcon;
+		private static BitmapImage? shieldIcon;
 
 		private CancellationTokenSource addFilesCTS;
 		private CancellationTokenSource semaphoreCTS;
 		private CancellationTokenSource loadPropsCTS;
 		private CancellationTokenSource watcherCTS;
-		private CancellationTokenSource searchCTS;
-		private CancellationTokenSource updateTagGroupCTS;
+		private CancellationTokenSource? searchCTS;
+		private CancellationTokenSource? updateTagGroupCTS;
 		private CancellationTokenSource? filterDebounceCS;
 		private CancellationTokenSource? networkAvailabilityCTS;
 
-		public event EventHandler FocusFilterHeader;
+		public event EventHandler? FocusFilterHeader;
 
-		public event EventHandler DirectoryInfoUpdated;
+		public event EventHandler? DirectoryInfoUpdated;
 
-		public event EventHandler GitDirectoryUpdated;
+		public event EventHandler? GitDirectoryUpdated;
 
-		public event EventHandler<List<ListedItem>> OnSelectionRequestedEvent;
+		public event EventHandler<List<ListedItem>>? OnSelectionRequestedEvent;
 
-		public string WorkingDirectory { get; private set; }
+		public string? WorkingDirectory { get; private set; }
 
 		public string? GitDirectory { get; private set; }
 
 		public bool IsValidGitDirectory { get; private set; }
 
-		public List<IniSectionDataItem> DesktopIni { get; private set; }
+		public List<IniSectionDataItem>? DesktopIni { get; private set; }
 
 		private StorageFolderWithPath? currentStorageFolder;
-		private StorageFolderWithPath workingRoot;
+		private StorageFolderWithPath? workingRoot;
 
-		public delegate void WorkingDirectoryModifiedEventHandler(object sender, WorkingDirectoryModifiedEventArgs e);
+		public delegate void WorkingDirectoryModifiedEventHandler(object? sender, WorkingDirectoryModifiedEventArgs e);
 
-		public event WorkingDirectoryModifiedEventHandler WorkingDirectoryModified;
+		public event WorkingDirectoryModifiedEventHandler? WorkingDirectoryModified;
 
-		public delegate void PageTypeUpdatedEventHandler(object sender, PageTypeUpdatedEventArgs e);
+		public delegate void PageTypeUpdatedEventHandler(object? sender, PageTypeUpdatedEventArgs e);
 
-		public event PageTypeUpdatedEventHandler PageTypeUpdated;
+		public event PageTypeUpdatedEventHandler? PageTypeUpdated;
 
-		public delegate void ItemLoadStatusChangedEventHandler(object sender, ItemLoadStatusChangedEventArgs e);
+		public delegate void ItemLoadStatusChangedEventHandler(object? sender, ItemLoadStatusChangedEventArgs e);
 
-		public event ItemLoadStatusChangedEventHandler ItemLoadStatusChanged;
+		public event ItemLoadStatusChangedEventHandler? ItemLoadStatusChanged;
 
 		public void InvokeFocusFilterHeader()
 		{
@@ -218,7 +219,7 @@ public async Task SetWorkingDirectoryAsync(string? value)
 
 			var isLibrary = false;
 			string? name = null;
-			if (App.LibraryManager.TryGetLibrary(value, out LibraryLocationItem library))
+			if (App.LibraryManager.TryGetLibrary(value, out var library))
 			{
 				isLibrary = true;
 				name = library.Text;
@@ -229,7 +230,7 @@ public async Task SetWorkingDirectoryAsync(string? value)
 			if (isLibrary || !Path.IsPathRooted(value))
 				workingRoot = currentStorageFolder = null;
 			else if (!Path.IsPathRooted(WorkingDirectory) || Path.GetPathRoot(WorkingDirectory) != Path.GetPathRoot(value))
-				workingRoot = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(value));
+				workingRoot = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(value));
 
 			if (value == "Home" || value == "ReleaseNotes" || value == "Settings")
 				currentStorageFolder = null;
@@ -258,7 +259,7 @@ public async Task<FilesystemResult<BaseStorageFolder>> GetFolderFromPathAsync(st
 			await getFileOrFolderSemaphore.WaitAsync(cancellationToken);
 			try
 			{
-				return await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(value, workingRoot, currentStorageFolder));
+				return await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(value, workingRoot, currentStorageFolder));
 			}
 			finally
 			{
@@ -271,7 +272,7 @@ public async Task<FilesystemResult<BaseStorageFile>> GetFileFromPathAsync(string
 			await getFileOrFolderSemaphore.WaitAsync(cancellationToken);
 			try
 			{
-				return await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(value, workingRoot, currentStorageFolder));
+				return await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(value, workingRoot, currentStorageFolder));
 			}
 			finally
 			{
@@ -743,7 +744,7 @@ private async void LayoutModeChangeRequested(object? sender, LayoutModeEventArgs
 			await dispatcherQueue.EnqueueOrInvokeAsync(CheckForBackgroundImage, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
 		}
 
-		private async void RecycleBinRefreshRequestedAsync(object sender, FileSystemEventArgs e)
+		private async void RecycleBinRefreshRequestedAsync(object? sender, FileSystemEventArgs e)
 		{
 			if (!Constants.UserEnvironmentPaths.RecycleBinPath.Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
 				return;
@@ -754,7 +755,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			});
 		}
 
-		private async void RecycleBinItemDeletedAsync(object sender, FileSystemEventArgs e)
+		private async void RecycleBinItemDeletedAsync(object? sender, FileSystemEventArgs e)
 		{
 			if (!Constants.UserEnvironmentPaths.RecycleBinPath.Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
 				return;
@@ -765,7 +766,7 @@ private async void RecycleBinItemDeletedAsync(object sender, FileSystemEventArgs
 				await ApplyFilesAndFoldersChangesAsync();
 		}
 
-		private async void RecycleBinItemCreatedAsync(object sender, FileSystemEventArgs e)
+		private async void RecycleBinItemCreatedAsync(object? sender, FileSystemEventArgs e)
 		{
 			if (!Constants.UserEnvironmentPaths.RecycleBinPath.Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
 				return;
@@ -775,6 +776,8 @@ private async void RecycleBinItemCreatedAsync(object sender, FileSystemEventArgs
 				return;
 
 			var shellFileItem = ShellFolderExtensions.GetShellFileItem(folderItem);
+			if (shellFileItem is null)
+				throw new InvalidDataException("The recycle-bin item could not be converted to a shell item.");
 
 			var newListedItem = await AddFileOrFolderFromShellFile(shellFileItem);
 			if (newListedItem is null)
@@ -915,7 +918,7 @@ public void CancelExtendedPropertiesLoading()
 
 		public void CancelExtendedPropertiesLoadingForItem(ListedItem item)
 		{
-			itemLoadQueue.TryUpdate(item.ItemPath, true, false);
+			itemLoadQueue.TryUpdate(item.GetRequiredPath(), true, false);
 		}
 
 		private bool _isSearchResults;
@@ -948,12 +951,9 @@ public void UpdateEmptyTextType()
 
 		public void UpdateNetworkAvailabilityInfoBar()
 		{
-			var shouldCheckNetworkAvailability =
-				!IsSearchResults &&
-				IsNetworkFolder(WorkingDirectory);
-
-			if (shouldCheckNetworkAvailability)
-				QueueNetworkAvailabilityUpdate(WorkingDirectory);
+			var workingDirectory = WorkingDirectory;
+			if (!IsSearchResults && IsNetworkFolder(workingDirectory))
+				QueueNetworkAvailabilityUpdate(workingDirectory);
 			else
 			{
 				CancelNetworkAvailabilityUpdate();
@@ -1004,7 +1004,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			});
 		}
 
-		private static bool IsNetworkFolder(string path)
+		private static bool IsNetworkFolder([NotNullWhen(true)] string? path)
 		{
 			return string.Equals(path, Constants.UserEnvironmentPaths.NetworkFolderPath, StringComparison.OrdinalIgnoreCase);
 		}
@@ -1085,10 +1085,14 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 								return;
 
 							FilesAndFolders.Clear();
-							if (string.IsNullOrEmpty(FilesAndFoldersFilter))
+							var filter = FilesAndFoldersFilter;
+							if (string.IsNullOrEmpty(filter))
 								FilesAndFolders.AddRange(filesAndFoldersLocal);
 							else
-								FilesAndFolders.AddRange(filesAndFoldersLocal.Where(x => x.Name.Contains(FilesAndFoldersFilter, StringComparison.OrdinalIgnoreCase)));
+								FilesAndFolders.AddRange(filesAndFoldersLocal.Where(x => (x.Name
+									?? throw new InvalidOperationException("A listed item does not have a name.")).Contains(
+									filter,
+									StringComparison.OrdinalIgnoreCase)));
 
 							if (folderSettings.DirectoryGroupOption != GroupOption.None)
 								OrderGroups();
@@ -1126,7 +1130,9 @@ private Task RequestSelectionAsync(List<ListedItem> itemsToSelect)
 		{
 			// Don't notify if shell page is not the active pane (eg. Dual Pane)
 			// https://github.com/files-community/Files/issues/17427
-			if (WorkingDirectory != ContentPageContext.ShellPage!.ShellViewModel.WorkingDirectory)
+			var activeShellViewModel = ContentPageContext.ShellPage?.ShellViewModel
+				?? throw new InvalidOperationException("The active shell page is not available.");
+			if (WorkingDirectory != activeShellViewModel.WorkingDirectory)
 				return Task.CompletedTask;
 
 			// Don't notify if there weren't listed items
@@ -1274,7 +1280,10 @@ public Task ReloadItemGroupHeaderImagesAsync()
 			{
 				foreach (var gp in FilesAndFolders.GroupedCollection.ToList())
 				{
-					var img = await GetItemTypeGroupIcon(gp.FirstOrDefault());
+					var item = gp.FirstOrDefault()
+						?? throw new InvalidOperationException("A file-type group does not contain an item.");
+
+					var img = await GetItemTypeGroupIcon(item);
 					await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 					{
 						gp.Model.ImageSource = img;
@@ -1298,7 +1307,7 @@ public bool IsLoadingItems
 			set => isLoadingItems = value;
 		}
 
-		private async Task<BitmapImage> GetShieldIcon()
+		private async Task<BitmapImage?> GetShieldIcon()
 		{
 			shieldIcon ??= await UIHelpers.GetShieldIconResource();
 
@@ -1415,18 +1424,18 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 						if (scheduleTimerRetry)
 						{
 							var retryCts = new CancellationTokenSource();
-							if (thumbnailRetryDebounce.TryAdd(item.ItemPath, retryCts))
+							if (thumbnailRetryDebounce.TryAdd(item.GetRequiredPath(), retryCts))
 							{
-								App.Logger.LogWarning("Thumbnail load failed [{Id}] '{Extension}'; scheduling 2s timer retry.", item.ItemPath.GetHashCode(), Path.GetExtension(item.ItemPath));
+								App.Logger.LogWarning("Thumbnail load failed [{Id}] '{Extension}'; scheduling 2s timer retry.", item.GetRequiredPath().GetHashCode(), Path.GetExtension(item.ItemPath));
 
 								var retryToken = retryCts.Token;
 								_ = Task.Delay(2000, retryToken)
 									.ContinueWith(_ =>
 									{
-										if (thumbnailRetryDebounce.TryRemove(item.ItemPath, out var cts))
-											cts.Dispose();
+									if (thumbnailRetryDebounce.TryRemove(item.GetRequiredPath(), out var cts))
+										cts.Dispose();
 
-										App.Logger.LogInformation("Timer-based thumbnail retry firing [{Id}] '{Extension}'.", item.ItemPath.GetHashCode(), Path.GetExtension(item.ItemPath));
+									App.Logger.LogInformation("Timer-based thumbnail retry firing [{Id}] '{Extension}'.", item.GetRequiredPath().GetHashCode(), Path.GetExtension(item.ItemPath));
 
 										item.NeedsDelayedThumbnailLoad = false;
 										return LoadThumbnailAsync(item, retryToken, scheduleTimerRetry: false);
@@ -1435,13 +1444,13 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 							}
 							else
 							{
-								App.Logger.LogWarning("Thumbnail load failed [{Id}] '{Extension}'; mod-retry already pending, skipping timer.", item.ItemPath.GetHashCode(), Path.GetExtension(item.ItemPath));
+								App.Logger.LogWarning("Thumbnail load failed [{Id}] '{Extension}'; mod-retry already pending, skipping timer.", item.GetRequiredPath().GetHashCode(), Path.GetExtension(item.ItemPath));
 								retryCts.Dispose();
 							}
 						}
 						else
 						{
-							App.Logger.LogWarning("Thumbnail load failed [{Id}] '{Extension}' on timer retry; awaiting next FILE_ACTION_MODIFIED.", item.ItemPath.GetHashCode(), Path.GetExtension(item.ItemPath));
+							App.Logger.LogWarning("Thumbnail load failed [{Id}] '{Extension}' on timer retry; awaiting next FILE_ACTION_MODIFIED.", item.GetRequiredPath().GetHashCode(), Path.GetExtension(item.ItemPath));
 						}
 					}
 					else
@@ -1461,7 +1470,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 		private static void SetFileTag(ListedItem item)
 		{
 			var dbInstance = FileTagsHelper.GetDbInstance();
-			dbInstance.SetTags(item.ItemPath, item.FileFRN, item.FileTags ?? []);
+			dbInstance.SetTags(item.GetRequiredPath(), item.FileFRN, item.FileTags ?? []);
 		}
 
 		// This works for recycle bin as well as GetFileFromPathAsync/GetFolderFromPathAsync work
@@ -1471,14 +1480,14 @@ public async Task LoadExtendedItemPropertiesAsync(ListedItem item)
 			if (item is null)
 				return;
 
-			itemLoadQueue[item.ItemPath] = false;
+			itemLoadQueue[item.GetRequiredPath()] = false;
 
 			var cts = loadPropsCTS;
 
 			try
 			{
 				cts.Token.ThrowIfCancellationRequested();
-				if (itemLoadQueue.TryGetValue(item.ItemPath, out var canceled) && canceled)
+				if (itemLoadQueue.TryGetValue(item.GetRequiredPath(), out var canceled) && canceled)
 					return;
 
 				item.ItemPropertiesInitialized = true;
@@ -1505,14 +1514,14 @@ public async Task LoadExtendedItemPropertiesAsync(ListedItem item)
 					{
 						if (!item.IsShortcut && !FtpHelpers.IsFtpPath(item.ItemPath))
 						{
-							matchingStorageFile = await GetFileFromPathAsync(item.ItemPath, cts.Token);
+							matchingStorageFile = await GetFileFromPathAsync(item.GetRequiredPath(), cts.Token);
 							if (matchingStorageFile is not null)
 							{
 								cts.Token.ThrowIfCancellationRequested();
 
 								var syncStatus = await CheckCloudDriveSyncStatusAsync(matchingStorageFile);
 								var fileFRN = await FileTagsHelper.GetFileFRN(matchingStorageFile);
-								var fileTag = FileTagsHelper.ReadFileTag(item.ItemPath);
+								var fileTag = FileTagsHelper.ReadFileTag(item.GetRequiredPath());
 								var itemType = (item.ItemType == Strings.Folder.GetLocalizedResource()) ? item.ItemType : matchingStorageFile.DisplayType;
 								var extraProperties = await GetExtraProperties(matchingStorageFile);
 
@@ -1520,15 +1529,19 @@ public async Task LoadExtendedItemPropertiesAsync(ListedItem item)
 
 								await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 								{
+									var properties = extraProperties?.Result;
+									if (extraProperties is not null && properties is null)
+										throw new InvalidOperationException("A file-property lookup did not return properties.");
+
 									item.FolderRelativeId = matchingStorageFile.FolderRelativeId;
 									item.ItemType = itemType;
 									item.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(syncStatus);
 									item.FileFRN = fileFRN;
 									item.FileTags = fileTag;
 									item.IsElevationRequired = CheckElevationRights(item);
-									item.ImageDimensions = extraProperties?.Result["System.Image.Dimensions"]?.ToString() ?? string.Empty;
-									item.FileVersion = extraProperties?.Result["System.FileVersion"]?.ToString() ?? string.Empty;
-									item.MediaDuration = ulong.TryParse(extraProperties?.Result["System.Media.Duration"]?.ToString(), out ulong duration)
+									item.ImageDimensions = properties?["System.Image.Dimensions"]?.ToString() ?? string.Empty;
+									item.FileVersion = properties?["System.FileVersion"]?.ToString() ?? string.Empty;
+									item.MediaDuration = ulong.TryParse(properties?["System.Media.Duration"]?.ToString(), out ulong duration)
 											? TimeSpan.FromTicks((long)duration).ToString(@"hh\:mm\:ss")
 											: string.Empty;
 
@@ -1559,7 +1572,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 					{
 						if (!item.IsShortcut && !item.IsHiddenItem && !FtpHelpers.IsFtpPath(item.ItemPath))
 						{
-							BaseStorageFolder matchingStorageFolder = await GetFolderFromPathAsync(item.ItemPath, cts.Token);
+							BaseStorageFolder? matchingStorageFolder = await GetFolderFromPathAsync(item.GetRequiredPath(), cts.Token);
 							if (matchingStorageFolder is not null)
 							{
 								if (matchingStorageFolder.DisplayName != item.Name && !matchingStorageFolder.DisplayName.StartsWith("$R", StringComparison.Ordinal))
@@ -1569,7 +1582,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 									{
 										item.ItemNameRaw = matchingStorageFolder.DisplayName;
 									});
-									await fileListCache.AddDisplayName(item.ItemPath, matchingStorageFolder.DisplayName);
+									await fileListCache.AddDisplayName(item.GetRequiredPath(), matchingStorageFolder.DisplayName);
 									if (folderSettings.DirectorySortOption == SortOption.Name && !isLoadingItems)
 									{
 										await OrderFilesAndFoldersAsync();
@@ -1580,7 +1593,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 								cts.Token.ThrowIfCancellationRequested();
 								var syncStatus = await CheckCloudDriveSyncStatusAsync(matchingStorageFolder);
 								var fileFRN = await FileTagsHelper.GetFileFRN(matchingStorageFolder);
-								var fileTag = FileTagsHelper.ReadFileTag(item.ItemPath);
+								var fileTag = FileTagsHelper.ReadFileTag(item.GetRequiredPath());
 								var itemType = (item.ItemType == Strings.Folder.GetLocalizedResource()) ? item.ItemType : matchingStorageFolder.DisplayType;
 								var extraProperties = await GetExtraProperties(matchingStorageFolder);
 
@@ -1596,10 +1609,13 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 
 									if (extraProperties is not null)
 									{
+										var properties = extraProperties.Result
+											?? throw new InvalidOperationException("A folder-property lookup did not return properties.");
+
 										// Drive Storage Details
-										if (extraProperties.Result["System.SFGAOFlags"] is uint attributesRaw &&
-											extraProperties.Result["System.Capacity"] is ulong capacityRaw &&
-											extraProperties.Result["System.FreeSpace"] is ulong freeSpaceRaw &&
+										if (properties["System.SFGAOFlags"] is uint attributesRaw &&
+											properties["System.Capacity"] is ulong capacityRaw &&
+											properties["System.FreeSpace"] is ulong freeSpaceRaw &&
 											((SFGAO_FLAGS)attributesRaw).HasFlag(SFGAO_FLAGS.SFGAO_REMOVABLE) &&
 											!((SFGAO_FLAGS)attributesRaw).HasFlag(SFGAO_FLAGS.SFGAO_FILESYSTEM))
 										{
@@ -1639,7 +1655,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 						cts.Token.ThrowIfCancellationRequested();
 						await FilesystemTasks.Wrap(async () =>
 						{
-							var fileTag = FileTagsHelper.ReadFileTag(item.ItemPath);
+							var fileTag = FileTagsHelper.ReadFileTag(item.GetRequiredPath());
 
 							await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 							{
@@ -1669,12 +1685,14 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 
 					if (loadGroupHeaderInfo)
 					{
+						var group = gp
+							?? throw new InvalidOperationException("The item group is unavailable while loading its header.");
 						cts.Token.ThrowIfCancellationRequested();
 						await SafetyExtensions.IgnoreExceptions(() =>
 							dispatcherQueue.EnqueueOrInvokeAsync(() =>
 							{
-								gp.Model.ImageSource = groupImage;
-								gp.InitializeExtendedGroupHeaderInfoAsync();
+								group.Model.ImageSource = groupImage;
+								group.InitializeExtendedGroupHeaderInfoAsync();
 							}));
 					}
 				}
@@ -1685,7 +1703,7 @@ await SafetyExtensions.IgnoreExceptions(() =>
 			}
 			finally
 			{
-				itemLoadQueue.TryRemove(item.ItemPath, out _);
+				itemLoadQueue.TryRemove(item.GetRequiredPath(), out _);
 				await RefreshTagGroups();
 			}
 		}
@@ -1710,7 +1728,7 @@ public Task UpdateItemsTags(Dictionary<string, string[]> newTags)
 				int count = newTags.Count;
 				foreach (var item in FilesAndFolders)
 				{
-					if (newTags.TryGetValue(item.ItemPath, out var tags))
+					if (newTags.TryGetValue(item.GetRequiredPath(), out var tags))
 					{
 						item.FileTags = tags;
 						if (--count == 0)
@@ -1726,7 +1744,8 @@ private bool CheckElevationRights(ListedItem item)
 			if (item.SyncStatusUI.LoadSyncStatus)
 				return false;
 
-			return WindowsSecurityService.IsElevationRequired(item.IsShortcut ? ((IShortcutItem)item).TargetPath : item.ItemPath);
+			var targetPath = (item as IShortcutItem)?.TargetPath;
+			return WindowsSecurityService.IsElevationRequired(!string.IsNullOrEmpty(targetPath) ? targetPath : item.ItemPath);
 		}
 
 		public async Task LoadGitPropertiesAsync(IGitItem gitItem)
@@ -1813,11 +1832,11 @@ await SafetyExtensions.IgnoreExceptions(() =>
 				// The groupImage is null if loading icon from fulltrust process failed
 				if (!item.IsShortcut && !item.IsHiddenItem && !FtpHelpers.IsFtpPath(item.ItemPath) && groupImage is null)
 				{
-					matchingStorageItem ??= await GetFileFromPathAsync(item.ItemPath);
+					matchingStorageItem ??= await GetFileFromPathAsync(item.GetRequiredPath());
 
 					if (matchingStorageItem is not null)
 					{
-						using StorageItemThumbnail headerThumbnail = await FilesystemTasks.Wrap(() => matchingStorageItem.GetThumbnailAsync(ThumbnailMode.DocumentsView, 36, ThumbnailOptions.UseCurrentScale).AsTask());
+						using StorageItemThumbnail? headerThumbnail = await FilesystemTasks.Wrap(() => matchingStorageItem.GetThumbnailAsync(ThumbnailMode.DocumentsView, 36, ThumbnailOptions.UseCurrentScale).AsTask());
 						if (headerThumbnail is not null)
 						{
 							await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
@@ -1844,12 +1863,12 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 			return groupImage;
 		}
 
-		public void RefreshItems(string? previousDir, Action postLoadCallback = null)
+		public void RefreshItems(string? previousDir, Action? postLoadCallback = null)
 		{
 			_ = RapidAddItemsToCollectionAsync(WorkingDirectory, previousDir, postLoadCallback);
 		}
 
-		private async Task RapidAddItemsToCollectionAsync(string path, string? previousDir, Action postLoadCallback)
+		private async Task RapidAddItemsToCollectionAsync(string? path, string? previousDir, Action? postLoadCallback)
 		{
 			IsSearchResults = false;
 			HasNoWatcher = false;
@@ -1890,7 +1909,7 @@ private async Task RapidAddItemsToCollectionAsync(string path, string? previousD
 
 				if (path.ToLowerInvariant().EndsWith(ShellLibraryItem.EXTENSION, StringComparison.Ordinal))
 				{
-					if (App.LibraryManager.TryGetLibrary(path, out LibraryLocationItem library) && !library.IsEmpty)
+					if (App.LibraryManager.TryGetLibrary(path, out var library) && !library.IsEmpty)
 					{
 						var libItem = new LibraryItem(library);
 						foreach (var folder in library.Folders)
@@ -2044,8 +2063,11 @@ private async Task<int> EnumerateItemsFromStandardFolderAsync(string path, Cance
 				if (!res)
 					return -1;
 
-				currentStorageFolder = res.Result;
-				rootFolder = currentStorageFolder.Item;
+				var storageFolder = res.Result
+					?? throw new InvalidOperationException("A successful folder lookup did not return a storage folder.");
+
+				currentStorageFolder = storageFolder;
+				rootFolder = storageFolder.Item;
 				enumFromStorageFolder = true;
 			}
 			else
@@ -2053,8 +2075,10 @@ private async Task<int> EnumerateItemsFromStandardFolderAsync(string path, Cance
 				var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path, workingRoot, currentStorageFolder));
 				if (res)
 				{
-					currentStorageFolder = res.Result;
-					rootFolder = currentStorageFolder.Item;
+					var storageFolder = res.Result
+						?? throw new InvalidOperationException("A successful folder lookup did not return a storage folder.");
+					currentStorageFolder = storageFolder;
+					rootFolder = storageFolder.Item;
 				}
 				else if (res == FileSystemStatusCode.Unauthorized)
 				{
@@ -2079,8 +2103,10 @@ private async Task<int> EnumerateItemsFromStandardFolderAsync(string path, Cance
 			var pathRoot = Path.GetPathRoot(path);
 			if (Path.IsPathRooted(path) && pathRoot == path)
 			{
-				rootFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path));
-				if (await FolderHelpers.CheckBitlockerStatusAsync(rootFolder, WorkingDirectory))
+				rootFolder ??= await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path));
+				if (await FolderHelpers.CheckBitlockerStatusAsync(
+					rootFolder,
+					WorkingDirectory ?? throw new InvalidOperationException("The working directory has not been initialized.")))
 					await ContextMenu.InvokeVerb("unlock-bde", pathRoot);
 			}
 
@@ -2215,7 +2241,7 @@ await Task.Run(async () =>
 						Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
 					});
 
-					rootFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path));
+					rootFolder ??= await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path));
 					if (rootFolder is not null)
 					{
 						if (rootFolder.DisplayName is not null)
@@ -2233,11 +2259,14 @@ await Task.Run(async () =>
 			}
 		}
 
-		private async Task EnumFromStorageFolderAsync(string path, BaseStorageFolder? rootFolder, StorageFolderWithPath currentStorageFolder, CancellationToken cancellationToken)
+		private async Task EnumFromStorageFolderAsync(string path, BaseStorageFolder? rootFolder, StorageFolderWithPath? currentStorageFolder, CancellationToken cancellationToken)
 		{
 			if (rootFolder is null)
 				return;
 
+			if (currentStorageFolder is null)
+				throw new InvalidOperationException("The storage-folder context is unavailable.");
+
 			if (rootFolder is IPasswordProtectedItem ppis)
 				ppis.PasswordRequestedCallback = async (item) =>
 				{
@@ -2289,7 +2318,9 @@ private void CheckForSolutionFile()
 
 		private void GetDesktopIniFileData()
 		{
-			var path = Path.Combine(WorkingDirectory, "desktop.ini");
+			var workingDirectory = WorkingDirectory
+				?? throw new InvalidOperationException("The working directory has not been initialized.");
+			var path = Path.Combine(workingDirectory, "desktop.ini");
 			DesktopIni = WindowsIniService.GetData(path);
 		}
 
@@ -2361,24 +2392,30 @@ public void CheckForBackgroundImage()
 				FolderBackgroundImageHorizontalAlignment = HorizontalAlignment.Center;
 		}
 
-		public async Task<CloudDriveSyncStatus> CheckCloudDriveSyncStatusAsync(IStorageItem item)
+		public async Task<CloudDriveSyncStatus> CheckCloudDriveSyncStatusAsync(IStorageItem? item)
 		{
 			int? syncStatus = null;
 			if (item is BaseStorageFile file && file.Properties is not null)
 			{
 				var extraProperties = await FilesystemTasks.Wrap(() => file.Properties.RetrievePropertiesAsync(["System.FilePlaceholderStatus"]).AsTask());
 				if (extraProperties)
-					syncStatus = (int?)(uint?)extraProperties.Result["System.FilePlaceholderStatus"];
+				{
+					var properties = extraProperties.Result
+						?? throw new InvalidOperationException("A successful file-property lookup did not return properties.");
+					syncStatus = (int?)(uint?)properties["System.FilePlaceholderStatus"];
+				}
 			}
 			else if (item is BaseStorageFolder folder && folder.Properties is not null)
 			{
 				var extraProperties = await FilesystemTasks.Wrap(() => folder.Properties.RetrievePropertiesAsync(["System.FilePlaceholderStatus", "System.FileOfflineAvailabilityStatus"]).AsTask());
 				if (extraProperties)
 				{
-					syncStatus = (int?)(uint?)extraProperties.Result["System.FileOfflineAvailabilityStatus"];
+					var properties = extraProperties.Result
+						?? throw new InvalidOperationException("A successful folder-property lookup did not return properties.");
+					syncStatus = (int?)(uint?)properties["System.FileOfflineAvailabilityStatus"];
 
 					// If no FileOfflineAvailabilityStatus, check FilePlaceholderStatus
-					syncStatus ??= (int?)(uint?)extraProperties.Result["System.FilePlaceholderStatus"];
+					syncStatus ??= (int?)(uint?)properties["System.FilePlaceholderStatus"];
 				}
 			}
 
@@ -2417,7 +2454,9 @@ await Task.Factory.StartNew(() =>
 
 				if (rootFolder.AreQueryOptionsSupported(options))
 				{
-					var itemQueryResult = rootFolder.CreateItemQueryWithOptions(options).ToStorageItemQueryResult();
+					var itemQueryResult = rootFolder.CreateItemQueryWithOptions(options).ToStorageItemQueryResult()
+						?? throw new InvalidOperationException("The folder query could not be converted to a storage query.");
+
 					itemQueryResult.ContentsChanged += ItemQueryResult_ContentsChanged;
 
 					// Just get one item to start getting notifications
@@ -2509,9 +2548,9 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
 				if (hasSyncStatus)
 					notifyFilters |= FILE_NOTIFY_CHANGE_ATTRIBUTES;
 
-				var overlapped = new OVERLAPPED();
+				var overlapped = new NativeOverlapped();
 				using var eventHandle = PInvoke.CreateEvent(null, false, false, null);
-				overlapped.hEvent = eventHandle.DangerousGetHandle();
+				overlapped.EventHandle = eventHandle.DangerousGetHandle();
 				const uint INFINITE = 0xFFFFFFFF;
 
 				while (x.Status != AsyncStatus.Canceled)
@@ -2523,10 +2562,15 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
 							ref var notifyInformation = ref Unsafe.As<byte, FILE_NOTIFY_INFORMATION>(ref buff[0]);
 							if (x.Status != AsyncStatus.Canceled)
 							{
-								ReadDirectoryChangesW(hWatchDir, pBuff,
-								4096, false,
-								notifyFilters, null,
-								ref overlapped, null);
+								PInvoke.ReadDirectoryChanges(
+									new Windows.Win32.Foundation.HANDLE(hWatchDir),
+									pBuff,
+									4096,
+									false,
+									(Windows.Win32.Storage.FileSystem.FILE_NOTIFY_CHANGE)notifyFilters,
+									null,
+									&overlapped,
+									null);
 							}
 							else
 							{
@@ -2537,7 +2581,7 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
 							if (x.Status == AsyncStatus.Canceled)
 								break;
 
-							var rc = WaitForSingleObjectEx(overlapped.hEvent, INFINITE, true);
+							var rc = WaitForSingleObjectEx(overlapped.EventHandle, INFINITE, true);
 							Debug.WriteLine("wait done: {0}", rand);
 
 							uint offset = 0;
@@ -2620,9 +2664,9 @@ private void WatchForGitChanges()
 				var rand = Guid.NewGuid();
 				var notifyFilters = FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_CREATION;
 
-				var overlapped = new OVERLAPPED();
+				var overlapped = new NativeOverlapped();
 				using var eventHandle = PInvoke.CreateEvent(null, false, false, null);
-				overlapped.hEvent = eventHandle.DangerousGetHandle();
+				overlapped.EventHandle = eventHandle.DangerousGetHandle();
 				const uint INFINITE = 0xFFFFFFFF;
 
 				while (x.Status != AsyncStatus.Canceled)
@@ -2635,15 +2679,20 @@ private void WatchForGitChanges()
 							if (x.Status == AsyncStatus.Canceled)
 								break;
 
-							ReadDirectoryChangesW(hWatchDir, pBuff,
-								4096, true,
-								notifyFilters, null,
-								ref overlapped, null);
+							PInvoke.ReadDirectoryChanges(
+								new Windows.Win32.Foundation.HANDLE(hWatchDir),
+								pBuff,
+								4096,
+								true,
+								(Windows.Win32.Storage.FileSystem.FILE_NOTIFY_CHANGE)notifyFilters,
+								null,
+								&overlapped,
+								null);
 
 							if (x.Status == AsyncStatus.Canceled)
 								break;
 
-							var rc = WaitForSingleObjectEx(overlapped.hEvent, INFINITE, true);
+							var rc = WaitForSingleObjectEx(overlapped.EventHandle, INFINITE, true);
 
 							uint offset = 0;
 							ref var notifyInfo = ref Unsafe.As<byte, FILE_NOTIFY_INFORMATION>(ref buff[offset]);
@@ -2784,7 +2833,7 @@ async Task HandleChangesOccurredAsync()
 										// sorted slot after a rename (issue #4214). Leaving anyEdits false skips
 										// OrderFilesAndFoldersAsync; PropertyChanged keeps the visible name in sync.
 										if (operationQueue.TryPeek(out var nextOp) && nextOp.Action == FILE_ACTION_RENAMED_NEW_NAME &&
-											filesAndFolders.ToList().FirstOrDefault(x => x.ItemPath.Equals(operation.FileName, StringComparison.OrdinalIgnoreCase)) is { } renamed)
+											filesAndFolders.ToList().FirstOrDefault(x => x.GetRequiredPath().Equals(operation.FileName, StringComparison.OrdinalIgnoreCase)) is { } renamed)
 										{
 											operationQueue.TryDequeue(out _);
 											var newPath = nextOp.FileName;
@@ -2842,7 +2891,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			Debug.WriteLine("aProcessQueueAction done: {0}", rand);
 		}
 
-		public Task<ListedItem> AddFileOrFolderFromShellFile(ShellFileItem item)
+		public Task<ListedItem?> AddFileOrFolderFromShellFile(ShellFileItem item)
 		{
 			return
 				item.IsFolder ?
@@ -2864,14 +2913,14 @@ private async Task AddFileOrFolderAsync(ListedItem? item)
 				return;
 			}
 
-			if (!filesAndFolders.ToList().Any(x => x.ItemPath.Equals(item.ItemPath, StringComparison.OrdinalIgnoreCase))) // Avoid adding duplicate items
+			if (!filesAndFolders.ToList().Any(x => x.GetRequiredPath().Equals(item.GetRequiredPath(), StringComparison.OrdinalIgnoreCase))) // Avoid adding duplicate items
 			{
 				filesAndFolders.Add(item);
 
 				if (UserSettingsService.FoldersSettingsService.AreAlternateStreamsVisible)
 				{
 					// New file added, enumerate ADS
-					foreach (var ads in Win32Helper.GetAlternateStreams(item.ItemPath))
+					foreach (var ads in Win32Helper.GetAlternateStreams(item.GetRequiredPath()))
 					{
 						var adsItem = Win32StorageEnumerator.GetAlternateStream(ads, item);
 						filesAndFolders.Add(adsItem);
@@ -2909,13 +2958,19 @@ private async Task AddFileOrFolderAsync(ListedItem? item)
 				return null;
 			}
 
-			ListedItem listedItem;
+			var parentPath = Directory.GetParent(fileOrFolderPath)?.FullName
+				?? throw new InvalidOperationException("The added item does not have a parent directory.");
+
+			ListedItem? listedItem;
 
 			// FILE_ATTRIBUTE_DIRECTORY
 			if ((findData.dwFileAttributes & 0x10) > 0)
-				listedItem = await Win32StorageEnumerator.GetFolder(findData, Directory.GetParent(fileOrFolderPath).FullName, IsValidGitDirectory, addFilesCTS.Token);
+				listedItem = await Win32StorageEnumerator.GetFolder(findData, parentPath, IsValidGitDirectory, addFilesCTS.Token);
 			else
-				listedItem = await Win32StorageEnumerator.GetFile(findData, Directory.GetParent(fileOrFolderPath).FullName, IsValidGitDirectory, addFilesCTS.Token);
+				listedItem = await Win32StorageEnumerator.GetFile(findData, parentPath, IsValidGitDirectory, addFilesCTS.Token);
+
+			if (listedItem is null)
+				return null;
 
 			await AddFileOrFolderAsync(listedItem);
 
@@ -2926,9 +2981,9 @@ private async Task AddFileOrFolderAsync(ListedItem? item)
 		{
 			IStorageItem? storageItem = null;
 			if (item.PrimaryItemAttribute == StorageItemTypes.File)
-				storageItem = (await GetFileFromPathAsync(item.ItemPath)).Result;
+				storageItem = (await GetFileFromPathAsync(item.GetRequiredPath())).Result;
 			else if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
-				storageItem = (await GetFolderFromPathAsync(item.ItemPath)).Result;
+				storageItem = (await GetFolderFromPathAsync(item.GetRequiredPath())).Result;
 
 			if (storageItem is not null)
 			{
@@ -2938,14 +2993,20 @@ private async Task AddFileOrFolderAsync(ListedItem? item)
 
 				if (storageItem.IsOfType(StorageItemTypes.File))
 				{
-					var properties = await storageItem.AsBaseStorageFile().GetBasicPropertiesAsync();
+					var file = storageItem.AsBaseStorageFile()
+						?? throw new InvalidOperationException("The storage item reported a file type but is not a storage file.");
+
+					var properties = await file.GetBasicPropertiesAsync();
 					size = (long)properties.Size;
 					modified = properties.DateModified;
 					created = properties.DateCreated;
 				}
 				else if (storageItem.IsOfType(StorageItemTypes.Folder))
 				{
-					var properties = await storageItem.AsBaseStorageFolder().GetBasicPropertiesAsync();
+					var folder = storageItem.AsBaseStorageFolder()
+						?? throw new InvalidOperationException("The storage item reported a folder type but is not a storage folder.");
+
+					var properties = await folder.GetBasicPropertiesAsync();
 					size = item.IsArchive ? (long)properties.Size : null;
 					modified = properties.DateModified;
 					created = properties.DateCreated;
@@ -2961,7 +3022,7 @@ private async Task UpdateFilesOrFoldersAsync(IEnumerable<string> paths, bool has
 		{
 			foreach (var path in paths)
 			{
-				var item = filesAndFolders.ToList().FirstOrDefault(x => x.ItemPath.Equals(path, StringComparison.OrdinalIgnoreCase));
+				var item = filesAndFolders.ToList().FirstOrDefault(x => x.GetRequiredPath().Equals(path, StringComparison.OrdinalIgnoreCase));
 				if (item is not null && item.NeedsDelayedThumbnailLoad)
 				{
 					App.Logger.LogInformation("FILE_ACTION_MODIFIED thumbnail retry triggered [{Id}] '{Extension}'.", path.GetHashCode(), Path.GetExtension(path));
@@ -3056,13 +3117,13 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 
 			try
 			{
-				var matchingItem = filesAndFolders.ToList().FirstOrDefault(x => x.ItemPath.Equals(path, StringComparison.OrdinalIgnoreCase));
+				var matchingItem = filesAndFolders.ToList().FirstOrDefault(x => x.GetRequiredPath().Equals(path, StringComparison.OrdinalIgnoreCase));
 
 				if (matchingItem is not null)
 				{
 					filesAndFolders.Remove(matchingItem);
 
-					if (thumbnailRetryDebounce.TryRemove(matchingItem.ItemPath, out var debounceCts))
+					if (thumbnailRetryDebounce.TryRemove(matchingItem.GetRequiredPath(), out var debounceCts))
 					{
 						debounceCts.Cancel();
 						debounceCts.Dispose();
@@ -3143,7 +3204,7 @@ public void CancelSearch()
 
 		public void UpdateDateDisplay()
 		{
-			App.Logger.LogDebug($"UpdateDateDisplay: itemCount={filesAndFolders?.Count}");
+			App.Logger.LogDebug($"UpdateDateDisplay: itemCount={filesAndFolders.Count}");
 
 			filesAndFolders.ToList().AsParallel().ForAll(async item =>
 			{
diff --git a/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs
index d90f086d44cd..5f9865e8edb9 100644
--- a/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs
@@ -19,7 +19,7 @@ public sealed partial class InfoPaneViewModel : ObservableObject, IDisposable
 		private IContentPageContext contentPageContext { get; } = Ioc.Default.GetRequiredService<IContentPageContext>();
 		private DrivesViewModel drivesViewModel { get; } = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
-		private CancellationTokenSource loadCancellationTokenSource;
+		private CancellationTokenSource? loadCancellationTokenSource;
 		private Files.App.UserControls.Menus.FileTagsContextMenu? cachedTagsContextMenu;
 
 		/// <summary>
@@ -121,8 +121,8 @@ public bool ShowCloudItemButton
 			set => SetProperty(ref showCloudItemButton, value);
 		}
 
-		private UIElement previewPaneContent;
-		public UIElement PreviewPaneContent
+		private UIElement? previewPaneContent;
+		public UIElement? PreviewPaneContent
 		{
 			get => previewPaneContent;
 			set
@@ -208,7 +208,11 @@ private async void ContentPageContext_PropertyChanged(object? sender, PropertyCh
 
 		private async Task LoadPreviewControlAsync(CancellationToken token, bool downloadItem)
 		{
-			if (SelectedItem.IsHiddenItem && !SelectedItem.ItemPath.EndsWith('\\'))
+			var item = SelectedItem;
+			if (item is null)
+				throw new InvalidOperationException("The preview pane does not have a selected item.");
+
+			if (item.IsHiddenItem && !item.ItemPath!.EndsWith('\\'))
 			{
 				PreviewPaneState = PreviewPaneStates.NoPreviewOrDetailsAvailable;
 
@@ -216,7 +220,7 @@ private async Task LoadPreviewControlAsync(CancellationToken token, bool downloa
 				return;
 			}
 
-			var control = await GetBuiltInPreviewControlAsync(SelectedItem, downloadItem);
+			var control = await GetBuiltInPreviewControlAsync(item, downloadItem);
 
 			if (token.IsCancellationRequested)
 				return;
@@ -228,7 +232,7 @@ private async Task LoadPreviewControlAsync(CancellationToken token, bool downloa
 				return;
 			}
 
-			var basicModel = new BasicPreviewViewModel(SelectedItem);
+			var basicModel = new BasicPreviewViewModel(item);
 			await basicModel.LoadAsync();
 
 			control = new BasicPreview(basicModel);
@@ -240,7 +244,7 @@ private async Task LoadPreviewControlAsync(CancellationToken token, bool downloa
 			PreviewPaneState = SelectedDriveItem is not null ? PreviewPaneStates.DriveStorageDetailsAvailable : PreviewPaneStates.PreviewAndDetailsAvailable;
 		}
 
-		private async Task<UserControl> GetBuiltInPreviewControlAsync(ListedItem item, bool downloadItem)
+		private async Task<UserControl?> GetBuiltInPreviewControlAsync(ListedItem item, bool downloadItem)
 		{
 			ShowCloudItemButton = false;
 
@@ -284,7 +288,7 @@ private async Task<UserControl> GetBuiltInPreviewControlAsync(ListedItem item, b
 				await model.LoadAsync();
 
 				if (contentPageContext.SelectedItems.Count == 0)
-					item.FileTags ??= FileTagsHelper.ReadFileTag(item.ItemPath);
+					item.FileTags ??= FileTagsHelper.ReadFileTag(item.ItemPath!);
 
 				return new FolderPreview(model);
 			}
@@ -498,7 +502,10 @@ private async Task LoadBasicPreviewAsync()
 		{
 			try
 			{
-				var basicModel = new BasicPreviewViewModel(SelectedItem);
+				if (SelectedItem is not { } selectedItem)
+					throw new InvalidOperationException("The preview pane does not have a selected item.");
+
+				var basicModel = new BasicPreviewViewModel(selectedItem);
 				await basicModel.LoadAsync();
 
 				PreviewPaneContent = new BasicPreview(basicModel);
@@ -523,23 +530,24 @@ private void UpdateTagsItems()
 			try
 			{
 				Items.Clear();
-
-				SelectedItem?.FileTagsUI?.ForEach(tag => Items.Add(new TagItem(tag)));
+				var selectedItem = SelectedItem;
+				selectedItem?.FileTagsUI?.ForEach(tag => Items.Add(new TagItem(tag)));
+				IEnumerable<ListedItem> selectedItems = selectedItem is null ? [] : [selectedItem];
 
 				// Create menu once and reuse it for subsequent selections
 				if (cachedTagsContextMenu is null)
 				{
-					cachedTagsContextMenu = new Files.App.UserControls.Menus.FileTagsContextMenu(new List<ListedItem>() { SelectedItem });
+					cachedTagsContextMenu = new Files.App.UserControls.Menus.FileTagsContextMenu(selectedItems);
 					cachedTagsContextMenu.TagsChanged += async (s, e) =>
 					{
-						if (contentPageContext.ShellPage is not null)
-							await contentPageContext.ShellPage.ShellViewModel.RefreshTagGroups();
+						if (contentPageContext.ShellPage is { } shellPage)
+							await shellPage.GetRequiredShellViewModel().RefreshTagGroups();
 					};
 				}
 				else
 				{
 					// Reset menu for new selection
-					cachedTagsContextMenu.ResetForItems(new List<ListedItem>() { SelectedItem });
+					cachedTagsContextMenu.ResetForItems(selectedItems);
 				}
 
 				Items.Add(new FlyoutItem(cachedTagsContextMenu));
@@ -560,7 +568,7 @@ private void SetDriveItem()
 				return;
 			}
 
-			var normalizedPath = PathNormalization.NormalizePath(selectedItem.ItemPath);
+			var normalizedPath = PathNormalization.NormalizePath(selectedItem.ItemPath!);
 
 			SelectedDriveItem = drivesViewModel.Drives
 				.OfType<DriveItem>()
diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
index 7e2f8d7f5c71..9f845fe5d39a 100644
--- a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
@@ -100,11 +100,11 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr
 
 		public bool CanExtract => Commands.DecompressArchive.CanExecute(null) || Commands.DecompressArchiveHere.CanExecute(null) || Commands.DecompressArchiveHereSmart.CanExecute(null) || Commands.DecompressArchiveToChildFolder.CanExecute(null);
 
-		public bool IsCardsLayout => _InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.CardsView;
-		public bool IsColumnLayout => _InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.ColumnView;
-		public bool IsGridLayout => _InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.GridView;
-		public bool IsDetailsLayout => _InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.DetailsView;
-		public bool IsListLayout => _InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.ListView;
+		public bool IsCardsLayout => InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.CardsView;
+		public bool IsColumnLayout => InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.ColumnView;
+		public bool IsGridLayout => InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.GridView;
+		public bool IsDetailsLayout => InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.DetailsView;
+		public bool IsListLayout => InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.ListView;
 
 		public bool IsLayoutSizeCompact =>
 			(IsDetailsLayout && UserSettingsService.LayoutSettingsService.DetailsViewSize == DetailsViewSizeKind.Compact) ||
@@ -181,15 +181,15 @@ public int UpdateProgress
 		private bool _CanRefresh;
 		public bool CanRefresh { get => _CanRefresh; set => SetProperty(ref _CanRefresh, value); }
 
-		private string _PathControlDisplayText;
+		private string? _PathControlDisplayText;
 		[Obsolete("Superseded by Omnibar.")]
-		public string PathControlDisplayText { get => _PathControlDisplayText; set => SetProperty(ref _PathControlDisplayText, value); }
+		public string? PathControlDisplayText { get => _PathControlDisplayText; set => SetProperty(ref _PathControlDisplayText, value); }
 
 		private bool _HasItem = false;
 		public bool HasItem { get => _HasItem; set => SetProperty(ref _HasItem, value); }
 
-		private Style _LayoutThemedIcon;
-		public Style LayoutThemedIcon { get => _LayoutThemedIcon; set => SetProperty(ref _LayoutThemedIcon, value); }
+		private Style? _LayoutThemedIcon;
+		public Style? LayoutThemedIcon { get => _LayoutThemedIcon; set => SetProperty(ref _LayoutThemedIcon, value); }
 
 		// SetProperty doesn't seem to properly notify the binding in path bar
 		private string? _PathText;
@@ -213,7 +213,7 @@ public string? PathText
 		private string? _OmnibarSearchModeText;
 		public string? OmnibarSearchModeText { get => _OmnibarSearchModeText; set => SetProperty(ref _OmnibarSearchModeText, value); }
 
-		public string OmnibarSearchModePlaceholder => InstanceViewModel?.IsPageTypeSettings == true
+		public string OmnibarSearchModePlaceholder => _InstanceViewModel?.IsPageTypeSettings == true
 			? Strings.SearchSettings.GetLocalizedResource()
 			: Strings.OmnibarSearchModeTextPlaceholder.GetLocalizedResource();
 
@@ -222,23 +222,24 @@ public string? PathText
 		private string _OmnibarCurrentSelectedModeName = OmnibarPathModeName;
 		public string OmnibarCurrentSelectedModeName { get => _OmnibarCurrentSelectedModeName; set => SetProperty(ref _OmnibarCurrentSelectedModeName, value); }
 
-		private CurrentInstanceViewModel _InstanceViewModel;
+		private CurrentInstanceViewModel? _InstanceViewModel;
 		public CurrentInstanceViewModel InstanceViewModel
 		{
-			get => _InstanceViewModel;
+			get => _InstanceViewModel
+				?? throw new InvalidOperationException("The navigation toolbar has not been initialized.");
 			set
 			{
-				if (_InstanceViewModel?.FolderSettings is not null)
-					_InstanceViewModel.FolderSettings.PropertyChanged -= FolderSettings_PropertyChanged;
-
-				if (_InstanceViewModel is not null)
-					_InstanceViewModel.PropertyChanged -= InstanceViewModel_PropertyChanged;
+				if (_InstanceViewModel is { } previousViewModel)
+				{
+					previousViewModel.FolderSettings.PropertyChanged -= FolderSettings_PropertyChanged;
+					previousViewModel.PropertyChanged -= InstanceViewModel_PropertyChanged;
+				}
 
-				if (SetProperty(ref _InstanceViewModel, value) && _InstanceViewModel?.FolderSettings is not null)
+				if (SetProperty(ref _InstanceViewModel, value))
 				{
 					FolderSettings_PropertyChanged(this, new PropertyChangedEventArgs(nameof(LayoutPreferencesManager.LayoutMode)));
-					_InstanceViewModel.FolderSettings.PropertyChanged += FolderSettings_PropertyChanged;
-					_InstanceViewModel.PropertyChanged += InstanceViewModel_PropertyChanged;
+					value.FolderSettings.PropertyChanged += FolderSettings_PropertyChanged;
+					value.PropertyChanged += InstanceViewModel_PropertyChanged;
 					OnPropertyChanged(nameof(OmnibarSearchModePlaceholder));
 				}
 			}
@@ -535,9 +536,13 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(
 
 		public async Task HandleItemNavigationAsync(string path)
 		{
-			if (ContentPageContext.ShellPage is null)
+			var shellPage = ContentPageContext.ShellPage;
+			if (shellPage is null)
 				return;
 
+			var shellViewModel = shellPage.ShellViewModel
+				?? throw new InvalidOperationException("The current shell page does not have a view model.");
+
 			var currentPath = PathComponents.LastOrDefault()?.Path;
 			var isFtp = FtpHelpers.IsFtpPath(path);
 			var normalizedInput = NormalizePathInput(path, isFtp);
@@ -545,28 +550,28 @@ public async Task HandleItemNavigationAsync(string path)
 				string.IsNullOrWhiteSpace(normalizedInput))
 				return;
 
-			if (normalizedInput.Equals(ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory) &&
-				ContentPageContext.ShellPage.CurrentPageType != typeof(HomePage) &&
-				!ContentPageContext.ShellPage.ShellViewModel.IsSearchResults)
+			if (normalizedInput.Equals(shellViewModel.WorkingDirectory) &&
+				shellPage.CurrentPageType != typeof(HomePage) &&
+				!shellViewModel.IsSearchResults)
 				return;
 
 			if (normalizedInput.Equals("Home", StringComparison.OrdinalIgnoreCase) ||
 				normalizedInput.Equals(Strings.Home.GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
 			{
 				SavePathToHistory("Home");
-				ContentPageContext.ShellPage.NavigateHome();
+				shellPage.NavigateHome();
 			}
 			else if (normalizedInput.Equals("ReleaseNotes", StringComparison.OrdinalIgnoreCase) ||
 				normalizedInput.Equals(Strings.ReleaseNotes.GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
 			{
 				SavePathToHistory("ReleaseNotes");
-				ContentPageContext.ShellPage.NavigateToReleaseNotes();
+				shellPage.NavigateToReleaseNotes();
 			}
 			else if (normalizedInput.Equals("Settings", StringComparison.OrdinalIgnoreCase) ||
 				normalizedInput.Equals(Strings.Settings.GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
 			{
 				SavePathToHistory("Settings");
-				ContentPageContext.ShellPage.NavigateToSettings();
+				shellPage.NavigateToSettings();
 			}
 			else
 			{
@@ -577,48 +582,63 @@ public async Task HandleItemNavigationAsync(string path)
 				var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(normalizedInput));
 
 				var resFolder = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(normalizedInput, item));
+				shellPage = ContentPageContext.ShellPage
+					?? throw new InvalidOperationException("The current shell page is no longer available.");
+
 				if (resFolder || FolderHelpers.CheckFolderAccessWithWin32(normalizedInput))
 				{
-					var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => PathNormalization.NormalizePath(normalizedInput).StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.Ordinal));
+					var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => PathNormalization.NormalizePath(normalizedInput).StartsWith(
+						PathNormalization.NormalizePath(x.GetRequiredPath()),
+						StringComparison.Ordinal));
 					if (matchingDrive is not null && matchingDrive.Type == Data.Items.DriveType.CDRom && matchingDrive.MaxSpace == ByteSizeLib.ByteSize.FromBytes(0))
 					{
-						bool ejectButton = await DialogDisplayHelper.ShowDialogAsync(Strings.InsertDiscDialogTitle.GetLocalizedResource(), string.Format(Strings.InsertDiscDialogText.GetLocalizedResource(), matchingDrive.Path), Strings.InsertDiscDialog_OpenDriveButton.GetLocalizedResource(), Strings.Close.GetLocalizedResource());
+						var drivePath = matchingDrive.GetRequiredPath();
+						bool ejectButton = await DialogDisplayHelper.ShowDialogAsync(Strings.InsertDiscDialogTitle.GetLocalizedResource(), string.Format(Strings.InsertDiscDialogText.GetLocalizedResource(), drivePath), Strings.InsertDiscDialog_OpenDriveButton.GetLocalizedResource(), Strings.Close.GetLocalizedResource());
 						if (ejectButton)
-							DriveHelpers.EjectDeviceAsync(matchingDrive.Path);
+							DriveHelpers.EjectDeviceAsync(drivePath);
 						return;
 					}
 
 					var pathToNavigate = resFolder.Result?.Path ?? normalizedInput;
 					SavePathToHistory(pathToNavigate);
-					ContentPageContext.ShellPage.NavigateToPath(pathToNavigate);
+					shellPage.NavigateToPath(pathToNavigate);
 				}
 				else if (isFtp)
 				{
 					SavePathToHistory(normalizedInput);
-					ContentPageContext.ShellPage.NavigateToPath(normalizedInput);
+					shellPage.NavigateToPath(normalizedInput);
 				}
 				else // Not a folder or inaccessible
 				{
 					var resFile = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileWithPathFromPathAsync(normalizedInput, item));
+					shellPage = ContentPageContext.ShellPage
+						?? throw new InvalidOperationException("The current shell page is no longer available.");
+
 					if (resFile)
 					{
-						var pathToInvoke = resFile.Result.Path;
-						await Win32Helper.InvokeWin32ComponentAsync(pathToInvoke, ContentPageContext.ShellPage);
+						var storageFile = resFile.Result
+							?? throw new InvalidOperationException("A successful file lookup did not return a storage file.");
+						await Win32Helper.InvokeWin32ComponentAsync(storageFile.Path, shellPage);
 					}
 					else // Not a file or not accessible
 					{
+						shellViewModel = shellPage.ShellViewModel
+							?? throw new InvalidOperationException("The current shell page does not have a view model.");
+
 						var workingDir =
-							string.IsNullOrEmpty(ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory) ||
-							ContentPageContext.ShellPage.CurrentPageType == typeof(HomePage)
+							string.IsNullOrEmpty(shellViewModel.WorkingDirectory) ||
+							shellPage.CurrentPageType == typeof(HomePage)
 								? Constants.UserEnvironmentPaths.HomePath
-								: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+								: shellViewModel.WorkingDirectory;
+						var pathText = PathText
+							?? throw new InvalidOperationException("The navigation path has not been initialized.");
 
-						if (await LaunchApplicationFromPath(PathText, workingDir))
+						if (await LaunchApplicationFromPath(pathText, workingDir))
 							return;
 
 						try
 						{
-							if (!await Windows.System.Launcher.LaunchUriAsync(new Uri(PathText)))
+							if (!await Windows.System.Launcher.LaunchUriAsync(new Uri(pathText)))
 								await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidItemDialogTitle.GetLocalizedResource(),
 									string.Format(Strings.InvalidItemDialogContent.GetLocalizedResource(), Environment.NewLine, resFolder.ErrorCode.ToString()));
 						}
@@ -631,7 +651,11 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidItemDialogTitle.GetLoca
 				}
 			}
 
-			PathControlDisplayText = ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+			shellPage = ContentPageContext.ShellPage
+				?? throw new InvalidOperationException("The current shell page is no longer available.");
+			shellViewModel = shellPage.ShellViewModel
+				?? throw new InvalidOperationException("The current shell page does not have a view model.");
+			PathControlDisplayText = shellViewModel.WorkingDirectory;
 		}
 
 		public void SwitchToCommandPaletteMode()
@@ -660,7 +684,7 @@ public async Task SwitchToPathMode()
 
 			OmnibarCurrentSelectedModeName = OmnibarPathModeName;
 			omnibar?.Focus(FocusState.Programmatic);
-			omnibar.IsFocused = true;
+			(omnibar ?? throw new InvalidOperationException("The omnibar is not available.")).IsFocused = true;
 		}
 
 		public void UpdateAdditionalActions()
@@ -670,16 +694,23 @@ public void UpdateAdditionalActions()
 
 		public async Task SetPathBoxDropDownFlyoutAsync(MenuFlyout flyout, PathBoxItem pathItem)
 		{
-			var childFolders = GetSubfolders(pathItem.Path);
+			var path = pathItem.Path
+				?? throw new InvalidOperationException("The path box item does not have a path.");
+
+			var childFolders = GetSubfolders(path);
 
 			// Fall back to StorageFolder API for non-filesystem paths (e.g. FTP)
 			if (childFolders is null)
 			{
-				StorageFolderWithPath folder = await ContentPageContext.ShellPage.ShellViewModel.GetFolderWithPathFromPathAsync(pathItem.Path);
-				if (folder is not null)
+				var shellPage = ContentPageContext.ShellPage
+					?? throw new InvalidOperationException("The current shell page is not available.");
+				var shellViewModel = shellPage.ShellViewModel
+					?? throw new InvalidOperationException("The current shell page does not have a view model.");
+				var folderResult = await shellViewModel.GetFolderWithPathFromPathAsync(path);
+				if (folderResult.Result is { } folder)
 				{
 					var result = (await FilesystemTasks.Wrap(() => folder.GetFoldersWithPathAsync(string.Empty))).Result;
-					childFolders = result?.Select(f => (f.Item.Name, f.Path, false)).ToList();
+					childFolders = result?.Select(f => (f.Item!.Name, f.Path, false)).ToList();
 				}
 			}
 
@@ -702,7 +733,7 @@ public async Task SetPathBoxDropDownFlyoutAsync(MenuFlyout flyout, PathBoxItem p
 			var workingPath =
 				PathComponents[PathComponents.Count - 1].Path?.TrimEnd(Path.DirectorySeparatorChar);
 
-			foreach (var (name, path, isHidden) in childFolders)
+			foreach (var (name, childPath, isHidden) in childFolders)
 			{
 				var flyoutItem = new MenuFlyoutItem
 				{
@@ -711,19 +742,21 @@ public async Task SetPathBoxDropDownFlyoutAsync(MenuFlyout flyout, PathBoxItem p
 					Opacity = isHidden ? Constants.UI.DimItemOpacity : 1.0,
 				};
 
-				if (workingPath != path)
+				if (workingPath != childPath)
 				{
 					flyoutItem.Click += (sender, args) =>
 					{
 						// Navigate to the directory
-						ContentPageContext.ShellPage.NavigateToPath(path);
+						var shellPage = ContentPageContext.ShellPage
+							?? throw new InvalidOperationException("The current shell page is not available.");
+						shellPage.NavigateToPath(childPath);
 					};
 				}
 
 				flyout.Items?.Add(flyoutItem);
 
 				// Start loading the thumbnail in the background
-				_ = LoadFlyoutItemIconAsync(flyoutItem, path);
+				_ = LoadFlyoutItemIconAsync(flyoutItem, childPath);
 			}
 		}
 
@@ -798,8 +831,11 @@ private static string NormalizePathInput(string currentInput, bool isFtp)
 		}
 
 		[Obsolete("Superseded by Omnibar.")]
-		public async Task CheckPathInputAsync(string currentInput, string currentSelectedPath, IShellPage shellPage)
+		public async Task CheckPathInputAsync(string currentInput, string? currentSelectedPath, IShellPage shellPage)
 		{
+			var shellViewModel = shellPage.ShellViewModel
+				?? throw new InvalidOperationException("The shell page does not have a view model.");
+
 			if (currentInput.StartsWith('>'))
 			{
 				var code = currentInput.Substring(1).Trim();
@@ -824,7 +860,7 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
 			if (currentSelectedPath == normalizedInput || string.IsNullOrWhiteSpace(normalizedInput))
 				return;
 
-			if (normalizedInput != shellPage.ShellViewModel.WorkingDirectory || shellPage.CurrentPageType == typeof(HomePage))
+			if (normalizedInput != shellViewModel.WorkingDirectory || shellPage.CurrentPageType == typeof(HomePage))
 			{
 				if (normalizedInput.Equals("Home", StringComparison.OrdinalIgnoreCase) || normalizedInput.Equals(Strings.Home.GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
 				{
@@ -847,17 +883,20 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
 					if (currentSelectedPath == normalizedInput)
 						return;
 
-					var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(normalizedInput));
+					var item = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(normalizedInput));
 
 					var resFolder = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(normalizedInput, item));
 					if (resFolder || FolderHelpers.CheckFolderAccessWithWin32(normalizedInput))
 					{
-						var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => PathNormalization.NormalizePath(normalizedInput).StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.Ordinal));
+						var matchingDrive = drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x => PathNormalization.NormalizePath(normalizedInput).StartsWith(
+							PathNormalization.NormalizePath(x.GetRequiredPath()),
+							StringComparison.Ordinal));
 						if (matchingDrive is not null && matchingDrive.Type == Data.Items.DriveType.CDRom && matchingDrive.MaxSpace == ByteSizeLib.ByteSize.FromBytes(0))
 						{
-							bool ejectButton = await DialogDisplayHelper.ShowDialogAsync(Strings.InsertDiscDialogTitle.GetLocalizedResource(), string.Format(Strings.InsertDiscDialogText.GetLocalizedResource(), matchingDrive.Path), Strings.InsertDiscDialog_OpenDriveButton.GetLocalizedResource(), Strings.Close.GetLocalizedResource());
+							var drivePath = matchingDrive.GetRequiredPath();
+							bool ejectButton = await DialogDisplayHelper.ShowDialogAsync(Strings.InsertDiscDialogTitle.GetLocalizedResource(), string.Format(Strings.InsertDiscDialogText.GetLocalizedResource(), drivePath), Strings.InsertDiscDialog_OpenDriveButton.GetLocalizedResource(), Strings.Close.GetLocalizedResource());
 							if (ejectButton)
-								DriveHelpers.EjectDeviceAsync(matchingDrive.Path);
+								DriveHelpers.EjectDeviceAsync(drivePath);
 							return;
 						}
 						var pathToNavigate = resFolder.Result?.Path ?? normalizedInput;
@@ -874,16 +913,17 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
 						var resFile = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileWithPathFromPathAsync(normalizedInput, item));
 						if (resFile)
 						{
-							var pathToInvoke = resFile.Result.Path;
-							await Win32Helper.InvokeWin32ComponentAsync(pathToInvoke, shellPage);
+							var storageFile = resFile.Result
+								?? throw new InvalidOperationException("A successful file lookup did not return a storage file.");
+							await Win32Helper.InvokeWin32ComponentAsync(storageFile.Path, shellPage);
 						}
 						else // Not a file or not accessible
 						{
 							var workingDir =
-								string.IsNullOrEmpty(shellPage.ShellViewModel.WorkingDirectory) ||
+								string.IsNullOrEmpty(shellViewModel.WorkingDirectory) ||
 								shellPage.CurrentPageType == typeof(HomePage) ?
 									Constants.UserEnvironmentPaths.HomePath :
-									shellPage.ShellViewModel.WorkingDirectory;
+									shellViewModel.WorkingDirectory;
 
 							if (await LaunchApplicationFromPath(currentInput, workingDir))
 								return;
@@ -943,11 +983,11 @@ public async Task PopulateOmnibarSuggestionsForPathMode()
 		{
 			var result = await SafetyExtensions.IgnoreExceptions((Func<Task<bool>>)(async () =>
 			{
-				List<OmnibarPathModeSuggestionModel>? newSuggestions = [];
+				List<OmnibarPathModeSuggestionModel> newSuggestions = [];
 				var pathText = this.PathText;
 
 				// If the current input is special, populate navigation history instead.
-				if (string.IsNullOrWhiteSpace((string)pathText) ||
+				if (string.IsNullOrWhiteSpace(pathText) ||
 					pathText is "Home" or "ReleaseNotes" or "Settings")
 				{
 					// Load previously entered path
@@ -958,24 +998,31 @@ public async Task PopulateOmnibarSuggestionsForPathMode()
 				}
 				else
 				{
-					var isFtp = FtpHelpers.IsFtpPath((string)pathText);
-					pathText = NormalizePathInput((string)pathText, isFtp);
-					var expandedPath = StorageFileExtensions.GetResolvedPath((string)pathText, isFtp);
+					var isFtp = FtpHelpers.IsFtpPath(pathText);
+					pathText = NormalizePathInput(pathText, isFtp);
+					var expandedPath = StorageFileExtensions.GetResolvedPath(pathText, isFtp);
 					var folderPath = PathNormalization.GetParentDir(expandedPath) ?? expandedPath;
-					StorageFolderWithPath folder = await ContentPageContext.ShellPage.ShellViewModel.GetFolderWithPathFromPathAsync(folderPath);
-					if (folder is null)
+					var shellViewModel = ContentPageContext.ShellPage?.ShellViewModel
+						?? throw new InvalidOperationException("The current shell page does not have a view model.");
+
+					var folderResult = await shellViewModel.GetFolderWithPathFromPathAsync(folderPath);
+					if (folderResult.Result is not { } folder)
 						return false;
 
-					var currPath = await folder.GetFoldersWithPathAsync(Path.GetFileName(expandedPath), MaxSuggestionsCount);
+					var currPath = (await folder.GetFoldersWithPathAsync(Path.GetFileName(expandedPath), MaxSuggestionsCount))!;
 					if (currPath.Count >= MaxSuggestionsCount)
 					{
-						newSuggestions.AddRange(currPath.Select(x => new OmnibarPathModeSuggestionModel(x.Path, x.Item.DisplayName)));
+						newSuggestions.AddRange(currPath.Select(CreateSuggestion));
 					}
 					else if (currPath.Any())
 					{
-						var subPath = await currPath.First().GetFoldersWithPathAsync((uint)(MaxSuggestionsCount - currPath.Count));
-						newSuggestions.AddRange(currPath.Select(x => new OmnibarPathModeSuggestionModel(x.Path, x.Item.DisplayName)));
-						newSuggestions.AddRange(subPath.Select(x => new OmnibarPathModeSuggestionModel(x.Path, PathNormalization.Combine(currPath.First().Item.DisplayName, x.Item.DisplayName))));
+						var firstPath = currPath.First();
+						var subPath = await firstPath.GetFoldersWithPathAsync((uint)(MaxSuggestionsCount - currPath.Count));
+						var firstDisplayName = firstPath.Item!.DisplayName;
+						newSuggestions.AddRange(currPath.Select(CreateSuggestion));
+						newSuggestions.AddRange(subPath.Select(x => new OmnibarPathModeSuggestionModel(
+							x.Path,
+							PathNormalization.Combine(firstDisplayName, x.Item!.DisplayName))));
 					}
 				}
 
@@ -1021,6 +1068,9 @@ public async Task PopulateOmnibarSuggestionsForPathMode()
 				}
 
 				return true;
+
+				static OmnibarPathModeSuggestionModel CreateSuggestion(StorageFolderWithPath folder)
+					=> new(folder.Path, folder.Item!.DisplayName);
 			}));
 
 			if (!result)
@@ -1033,9 +1083,9 @@ void AddNoResultsItem()
 				PathModeSuggestionItems.Clear();
 				
 				// Use null-safe access to avoid NullReferenceException during app lifecycle transitions
-				var workingDirectory = string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
-					? Constants.UserEnvironmentPaths.HomePath
-					: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+				var workingDirectory = ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory;
+				if (string.IsNullOrEmpty(workingDirectory))
+					workingDirectory = Constants.UserEnvironmentPaths.HomePath;
 				
 				PathModeSuggestionItems.Add(new(
 					workingDirectory,
@@ -1045,14 +1095,17 @@ void AddNoResultsItem()
 
 		public async Task PopulateOmnibarSuggestionsForCommandPaletteMode()
 		{
+			if (OmnibarCommandPaletteModeText is not { } commandPaletteText)
+				return;
+
 			var (suggestionsToProcess, commandsToProcess) = await Task.Run(() =>
 			{
 				var suggestions = new List<NavigationBarSuggestionItem>();
 
 				var commandsData = Commands
 					.Where(command => command.IsAccessibleGlobally
-						&& (command.Description.Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)
-							|| command.Code.ToString().Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)))
+						&& (command.Description.Contains(commandPaletteText, StringComparison.OrdinalIgnoreCase)
+							|| command.Code.ToString().Contains(commandPaletteText, StringComparison.OrdinalIgnoreCase)))
 					.Where(command => command.Description != Commands.OpenCommandPalette.Description.ToString())
 					.ToList();
 
@@ -1145,11 +1198,13 @@ public async Task PopulateOmnibarSuggestionsForSearchMode()
 				try
 				{
 					await Task.Delay(200, token);
+					var shellViewModel = ContentPageContext.ShellPage?.ShellViewModel
+						?? throw new InvalidOperationException("The current shell page does not have a view model.");
 
 					var search = new FolderSearch
 					{
 						Query = OmnibarSearchModeText,
-						Folder = ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory,
+						Folder = shellViewModel.WorkingDirectory,
 						MaxItemCount = 10,
 					};
 
@@ -1207,7 +1262,7 @@ private void FolderSettings_PropertyChanged(object? sender, PropertyChangedEvent
 			switch (e.PropertyName)
 			{
 				case nameof(LayoutPreferencesManager.LayoutMode):
-					LayoutThemedIcon = _InstanceViewModel.FolderSettings.LayoutMode switch
+					LayoutThemedIcon = InstanceViewModel.FolderSettings.LayoutMode switch
 					{
 						FolderLayoutModes.ListView => Commands.LayoutList.ThemedIconStyle!,
 						FolderLayoutModes.CardsView => Commands.LayoutCards.ThemedIconStyle!,
diff --git a/src/Files.App/ViewModels/UserControls/Previews/ArchivePreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/ArchivePreviewViewModel.cs
index bd4268930d40..1b105810bba6 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/ArchivePreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/ArchivePreviewViewModel.cs
@@ -18,13 +18,20 @@ public override async Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
 			var details = new List<FileProperty>();
 
-			using SevenZipExtractor zipFile = await FilesystemTasks.Wrap(async () =>
+			var zipResult = await FilesystemTasks.WrapNullable<SevenZipExtractor>(async () =>
 			{
-				var arch = new SevenZipExtractor(await Item.ItemFile.OpenStreamForReadAsync());
+				var arch = new SevenZipExtractor(await PreviewFile.OpenStreamForReadAsync());
 
 				// Force load archive (1665013614u)
-				return arch?.ArchiveFileData is null ? null : arch;
+				if (arch.ArchiveFileData is null)
+				{
+					arch.Dispose();
+					return null;
+				}
+
+				return arch;
 			});
+			using var zipFile = zipResult.Result;
 
 			if (zipFile is null)
 			{
diff --git a/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs
index 63839ade64d8..8a4bb8da451a 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using System.IO;
 using Files.App.ViewModels.Properties;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media.Imaging;
@@ -13,14 +14,17 @@ public abstract partial class BasePreviewModel : ObservableObject
 
 		public ListedItem Item { get; }
 
-		private BitmapImage fileImage;
-		public BitmapImage FileImage
+		protected BaseStorageFile PreviewFile
+			=> Item.ItemFile ?? throw new InvalidOperationException("The preview file has not been loaded.");
+
+		private BitmapImage? fileImage;
+		public BitmapImage? FileImage
 		{
 			get => fileImage;
 			protected set => SetProperty(ref fileImage, value);
 		}
 
-		public List<FileProperty> DetailsFromPreview { get; set; }
+		public List<FileProperty>? DetailsFromPreview { get; set; }
 
 		/// <summary>
 		/// This is cancelled when the user has selected another file or closed the pane.
@@ -30,9 +34,9 @@ public BitmapImage FileImage
 		public BasePreviewModel(ListedItem item) : base()
 			=> Item = item;
 
-		public delegate void LoadedEventHandler(object sender, EventArgs e);
+		public delegate void LoadedEventHandler(object? sender, EventArgs e);
 
-		public static Task LoadDetailsOnlyAsync(ListedItem item, List<FileProperty> details = null)
+		public static Task LoadDetailsOnlyAsync(ListedItem item, List<FileProperty>? details = null)
 		{
 			var temp = new DetailsOnlyPreviewModel(item) { DetailsFromPreview = details };
 			return temp.LoadAsync();
@@ -52,8 +56,9 @@ public virtual async Task LoadAsync()
 
 			if (Item.ItemFile is null)
 			{
-				var rootItem = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(Item.ItemPath));
-				Item.ItemFile = await StorageFileExtensions.DangerousGetFileFromPathAsync(Item.ItemPath, rootItem);
+				var itemPath = Item.ItemPath!;
+				var rootItem = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(itemPath));
+				Item.ItemFile = await StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath, rootItem.Result);
 			}
 
 			await Task.Run(async () =>
@@ -63,11 +68,9 @@ await Task.Run(async () =>
 				{
 					// Add the details from the preview function, then the system file properties
 					DetailsFromPreview?.ForEach(i => detailsFull.Add(i));
-					List<FileProperty> props = await GetSystemFilePropertiesAsync();
+					List<FileProperty>? props = await GetSystemFilePropertiesAsync();
 					if (props is not null)
-					{
 						detailsFull.AddRange(props);
-					}
 				}
 			});
 
@@ -102,28 +105,38 @@ public async virtual Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="e"></param>
-		public virtual void PreviewControlBase_Unloaded(object sender, RoutedEventArgs e)
+		public virtual void PreviewControlBase_Unloaded(object? sender, RoutedEventArgs e)
 			=> LoadCancelledTokenSource.Cancel();
 
-		protected static FileProperty GetFileProperty(string nameResource, object value)
+		protected static FileProperty GetFileProperty(string nameResource, object? value)
 			=> new() { NameResource = nameResource, Value = value };
 
-		private async Task<List<FileProperty>> GetSystemFilePropertiesAsync()
+		private async Task<List<FileProperty>?> GetSystemFilePropertiesAsync()
 		{
 			if (Item.IsShortcut)
 				return null;
+			if (Item.ItemFile is null)
+				throw new InvalidOperationException("The preview item could not be opened as a file.");
 
 			var list = await FileProperty.RetrieveAndInitializePropertiesAsync(Item.ItemFile,
 				Constants.ResourceFilePaths.PreviewPaneDetailsPropertiesJsonPath);
 
-			list.Find(x => x.ID is "address").Value = await LocationHelpers.GetAddressFromCoordinatesAsync(
-				(double?)list.Find(x => x.Property is "System.GPS.LatitudeDecimal").Value,
-				(double?)list.Find(x => x.Property is "System.GPS.LongitudeDecimal").Value
-			);
+			var address = list.Find(x => x.ID is "address")
+				?? throw new InvalidDataException("The preview property definition is missing the address field.");
+			var latitude = list.Find(x => x.Property is "System.GPS.LatitudeDecimal")
+				?? throw new InvalidDataException("The preview property definition is missing the latitude field.");
+			var longitude = list.Find(x => x.Property is "System.GPS.LongitudeDecimal")
+				?? throw new InvalidDataException("The preview property definition is missing the longitude field.");
+			address.Value = await LocationHelpers.GetAddressFromCoordinatesAsync(
+				(double?)latitude.Value,
+				(double?)longitude.Value);
 
 			// Adds the value for the file tag
-			list.FirstOrDefault(x => x.ID is "filetag").Value =
-				Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.Name)) : null;
+			var fileTag = list.FirstOrDefault(x => x.ID is "filetag")
+				?? throw new InvalidDataException("The preview property definition is missing the file tag field.");
+			fileTag.Value = Item.FileTagsUI is not null
+				? string.Join(',', Item.FileTagsUI.Select(x => x.Name))
+				: null;
 
 			return list.Where(i => i.ValueText is not null).ToList();
 		}
@@ -132,7 +145,7 @@ private sealed partial class DetailsOnlyPreviewModel : BasePreviewModel
 		{
 			public DetailsOnlyPreviewModel(ListedItem item) : base(item) { }
 
-			public override Task<List<FileProperty>> LoadPreviewAndDetailsAsync() => Task.FromResult(DetailsFromPreview);
+			public override Task<List<FileProperty>> LoadPreviewAndDetailsAsync() => Task.FromResult(DetailsFromPreview ?? []);
 		}
 	}
 }
diff --git a/src/Files.App/ViewModels/UserControls/Previews/CodePreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/CodePreviewViewModel.cs
index 68ac5b647141..8dbd7c3cb4c4 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/CodePreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/CodePreviewViewModel.cs
@@ -11,15 +11,15 @@ public sealed partial class CodePreviewViewModel : BasePreviewModel
 	{
 		private static readonly FrozenDictionary<string, ILanguage> extensions = GetDictionary();
 
-		private string textValue;
-		public string TextValue
+		private string? textValue;
+		public string? TextValue
 		{
 			get => textValue;
 			private set => SetProperty(ref textValue, value);
 		}
 
-		private ILanguage codeLanguage;
-		public ILanguage CodeLanguage
+		private ILanguage? codeLanguage;
+		public ILanguage? CodeLanguage
 		{
 			get => codeLanguage;
 			private set => SetProperty(ref codeLanguage, value);
@@ -39,10 +39,10 @@ public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 
 			try
 			{
-				var text = TextValue ?? await ReadFileAsTextAsync(Item.ItemFile);
+				var text = TextValue ?? await ReadFileAsTextAsync(PreviewFile);
 				details.Add(GetFileProperty("PropertyLineCount", text.Split('\n').Length));
 
-				CodeLanguage = extensions[Item.FileExtension.ToLowerInvariant()];
+				CodeLanguage = extensions[Item.FileExtension!.ToLowerInvariant()];
 				TextValue = text.Left(Constants.PreviewPane.TextCharacterLimit);
 			}
 			catch (Exception e)
diff --git a/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs
index fd2f759d306a..cd0ea8ea7009 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs
@@ -12,9 +12,9 @@ public sealed class FolderPreviewViewModel
 		private readonly InfoPaneViewModel infoPaneViewModel = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
 		public ListedItem Item { get; }
 
-		public BitmapImage Thumbnail { get; set; } = new();
+		public BitmapImage? Thumbnail { get; set; } = new();
 
-		private BaseStorageFolder Folder { get; set; }
+		private BaseStorageFolder? Folder { get; set; }
 
 		public FolderPreviewViewModel(ListedItem item)
 			=> Item = item;
@@ -24,9 +24,13 @@ public Task LoadAsync()
 
 		private async Task LoadPreviewAndDetailsAsync()
 		{
-			var rootItem = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(Item.ItemPath));
-			Folder = await StorageFileExtensions.DangerousGetFolderFromPathAsync(Item.ItemPath, rootItem);
-			var items = await Folder.GetItemsAsync();
+			var itemPath = Item.ItemPath!;
+			var rootItem = await FilesystemTasks.WrapNullable(() => DriveHelpers.GetRootFromPathAsync(itemPath));
+			var folder = await StorageFileExtensions.DangerousGetFolderFromPathAsync(itemPath, rootItem.Result)
+				?? throw new InvalidOperationException("The preview folder could not be opened.");
+
+			Folder = folder;
+			var items = await folder.GetItemsAsync();
 
 			var result = await FileThumbnailHelper.GetIconAsync(
 				Item.ItemPath,
@@ -43,20 +47,20 @@ private async Task LoadPreviewAndDetailsAsync()
 			if (Item.IsDriveRoot || infoPaneViewModel?.SelectedDriveItem is not null)
 				return;
 
-			var info = await Folder.GetBasicPropertiesAsync();
+			var info = await folder.GetBasicPropertiesAsync();
 
 			Item.FileDetails =
 			[
 				GetFileProperty("PropertyItemCount", infoPaneViewModel?.DirectoryItemCount),
 				GetFileProperty("PropertyDateModified", info.DateModified),
 				GetFileProperty("PropertyDateCreated", info.DateCreated),
-				GetFileProperty("PropertyParsingPath", Folder.Path),
+				GetFileProperty("PropertyParsingPath", folder.Path),
 			];
 
 			if (GitHelpers.IsRepositoryEx(Item.ItemPath, out var repoPath) &&
 				!string.IsNullOrEmpty(repoPath))
 			{
-				var gitDirectory = GitHelpers.GetGitRepositoryPath(Folder.Path, Path.GetPathRoot(Folder.Path));
+				var gitDirectory = GitHelpers.GetGitRepositoryPath(folder.Path, Path.GetPathRoot(folder.Path));
 				var headName = (await GitHelpers.GetRepositoryHead(gitDirectory))?.Name ?? string.Empty;
 				var repositoryName = GitHelpers.GetOriginRepositoryName(gitDirectory);
 
@@ -68,7 +72,7 @@ private async Task LoadPreviewAndDetailsAsync()
 			}
 		}
 
-		private static FileProperty GetFileProperty(string nameResource, object value)
+		private static FileProperty GetFileProperty(string nameResource, object? value)
 			=> new() { NameResource = nameResource, Value = value };
 	}
 }
diff --git a/src/Files.App/ViewModels/UserControls/Previews/ImagePreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/ImagePreviewViewModel.cs
index dbc9f9c2ad6f..2a4800be0e1c 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/ImagePreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/ImagePreviewViewModel.cs
@@ -11,8 +11,8 @@ namespace Files.App.ViewModels.Previews
 {
 	public sealed partial class ImagePreviewViewModel : BasePreviewModel
 	{
-		private ImageSource imageSource;
-		public ImageSource ImageSource
+		private ImageSource? imageSource;
+		public ImageSource? ImageSource
 		{
 			get => imageSource;
 			private set => SetProperty(ref imageSource, value);
@@ -25,7 +25,7 @@ public ImagePreviewViewModel(ListedItem item)
 
 		public override async Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
-			using IRandomAccessStream stream = await Item.ItemFile.OpenAsync(FileAccessMode.Read);
+			using IRandomAccessStream stream = await PreviewFile.OpenAsync(FileAccessMode.Read);
 
 			await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 			{
diff --git a/src/Files.App/ViewModels/UserControls/Previews/MarkdownPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/MarkdownPreviewViewModel.cs
index 264cfbcaea58..cc53068f87c8 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/MarkdownPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/MarkdownPreviewViewModel.cs
@@ -8,8 +8,8 @@ namespace Files.App.ViewModels.Previews
 {
 	public sealed partial class MarkdownPreviewViewModel : BasePreviewModel
 	{
-		private string textValue;
-		public string TextValue
+		private string? textValue;
+		public string? TextValue
 		{
 			get => textValue;
 			private set => SetProperty(ref textValue, value);
@@ -22,7 +22,7 @@ public MarkdownPreviewViewModel(ListedItem item)
 
 		public override async Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
-			var text = await ReadFileAsTextAsync(Item.ItemFile);
+			var text = await ReadFileAsTextAsync(PreviewFile);
 			TextValue = EscapeRawHtml(text.Left(Constants.PreviewPane.TextCharacterLimit));
 
 			return [];
diff --git a/src/Files.App/ViewModels/UserControls/Previews/MediaPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/MediaPreviewViewModel.cs
index 7221dbc7d5a6..e30e692e2c28 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/MediaPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/MediaPreviewViewModel.cs
@@ -9,10 +9,10 @@ namespace Files.App.ViewModels.Previews
 {
 	public sealed partial class MediaPreviewViewModel : BasePreviewModel
 	{
-		public event EventHandler TogglePlaybackRequested;
+		public event EventHandler? TogglePlaybackRequested;
 
-		private MediaSource source;
-		public MediaSource Source
+		private MediaSource? source;
+		public MediaSource? Source
 		{
 			get => source;
 			private set => SetProperty(ref source, value);
@@ -21,16 +21,18 @@ public MediaSource Source
 		public MediaPreviewViewModel(ListedItem item) : base(item) { }
 
 		public void TogglePlayback()
-			=> TogglePlaybackRequested?.Invoke(this, null);
+			=> TogglePlaybackRequested?.Invoke(this, null!);
 
 		public override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
-			Source = MediaSource.CreateFromStorageFile(Item.ItemFile);
+			var itemFile = Item.ItemFile
+				?? throw new InvalidOperationException("The media preview item does not have a storage file.");
+			Source = MediaSource.CreateFromStorageFile(itemFile);
 
 			return Task.FromResult(new List<FileProperty>());
 		}
 
-		public override void PreviewControlBase_Unloaded(object sender, RoutedEventArgs e)
+		public override void PreviewControlBase_Unloaded(object? sender, RoutedEventArgs e)
 		{
 			Source = null;
 
diff --git a/src/Files.App/ViewModels/UserControls/Previews/PDFPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/PDFPreviewViewModel.cs
index 7e039bb0c259..4cbd9131e681 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/PDFPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/PDFPreviewViewModel.cs
@@ -36,7 +36,7 @@ public PDFPreviewViewModel(ListedItem item)
 
 		public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
-			var fileStream = await Item.ItemFile.OpenReadAsync();
+			var fileStream = await PreviewFile.OpenReadAsync();
 			var pdf = await PdfDocument.LoadFromStreamAsync(fileStream);
 			_ = TryLoadPagesAsync(pdf, fileStream);
 
diff --git a/src/Files.App/ViewModels/UserControls/Previews/RichTextPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/RichTextPreviewViewModel.cs
index 18d55829a526..f3905b176d74 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/RichTextPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/RichTextPreviewViewModel.cs
@@ -8,13 +8,13 @@ namespace Files.App.ViewModels.Previews
 {
 	public sealed partial class RichTextPreviewViewModel : BasePreviewModel
 	{
-		public IRandomAccessStream Stream { get; set; }
+		public IRandomAccessStream? Stream { get; set; }
 
 		public RichTextPreviewViewModel(ListedItem item) : base(item) { }
 
 		public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
-			Stream = await Item.ItemFile.OpenReadAsync();
+			Stream = await PreviewFile.OpenReadAsync();
 
 			return [];
 		}
diff --git a/src/Files.App/ViewModels/UserControls/Previews/ShellPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/ShellPreviewViewModel.cs
index f105eaee105e..3f291b576106 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/ShellPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/ShellPreviewViewModel.cs
@@ -97,7 +97,7 @@ private unsafe LRESULT WndProc(HWND hwnd, uint msg, WPARAM wParam, LPARAM lParam
 		{
 			if (msg is PInvoke.WM_CREATE)
 			{
-				var clsid = FindPreviewHandlerFor(Item.FileExtension, hwnd);
+				var clsid = FindPreviewHandlerFor(Item.FileExtension!, hwnd);
 
 				_isOfficePreview = new Guid?[]
 				{
@@ -109,7 +109,7 @@ private unsafe LRESULT WndProc(HWND hwnd, uint msg, WPARAM wParam, LPARAM lParam
 				try
 				{
 					_previewHandler = new PreviewHandler(clsid!.Value, hwnd);
-					_previewHandler.InitWithFileWithEveryWay(Item.ItemPath);
+					_previewHandler.InitWithFileWithEveryWay(Item.ItemPath!);
 					_previewHandler.DoPreview();
 				}
 				catch
diff --git a/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs
index ee0d5126488d..745eb21c48f0 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs
@@ -11,7 +11,9 @@ public ShortcutPreviewViewModel(ListedItem item) : base(item) { }
 
 		public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
-			var item = Item as IShortcutItem;
+			if (Item is not IShortcutItem item)
+				throw new InvalidOperationException("The shortcut preview item does not implement the shortcut contract.");
+
 			var details = new List<FileProperty>
 			{
 				GetFileProperty("PropertyParsingPath", item.ItemPath),
diff --git a/src/Files.App/ViewModels/UserControls/Previews/TextPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/TextPreviewViewModel.cs
index 0fa858db2077..84c512256a28 100644
--- a/src/Files.App/ViewModels/UserControls/Previews/TextPreviewViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Previews/TextPreviewViewModel.cs
@@ -8,8 +8,8 @@ namespace Files.App.ViewModels.Previews
 {
 	public sealed partial class TextPreviewViewModel : BasePreviewModel
 	{
-		private string textValue;
-		public string TextValue
+		private string? textValue;
+		public string? TextValue
 		{
 			get => textValue;
 			private set => SetProperty(ref textValue, value);
@@ -26,7 +26,7 @@ public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 
 			try
 			{
-				var text = TextValue ?? await ReadFileAsTextAsync(Item.ItemFile);
+				var text = TextValue ?? await ReadFileAsTextAsync(PreviewFile);
 
 				details.Add(GetFileProperty("PropertyLineCount", text.Split('\n').Length));
 				details.Add(GetFileProperty("PropertyWordCount", text.Split(new[] { ' ', '\n' }, StringSplitOptions.RemoveEmptyEntries).Length));
@@ -41,17 +41,19 @@ public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 			return details;
 		}
 
-		public static async Task<TextPreview> TryLoadAsTextAsync(ListedItem item)
+		public static async Task<TextPreview?> TryLoadAsTextAsync(ListedItem item)
 		{
-			string extension = item.FileExtension?.ToLowerInvariant();
+			string? extension = item.FileExtension?.ToLowerInvariant();
 			if (ExcludedExtensions(extension) || item.FileSizeBytes is 0 or > Constants.PreviewPane.TryLoadAsTextSizeLimit)
 				return null;
 
 			try
 			{
-				item.ItemFile = await StorageFileExtensions.DangerousGetFileFromPathAsync(item.ItemPath);
+				item.ItemFile = await StorageFileExtensions.DangerousGetFileFromPathAsync(item.ItemPath!);
+				if (item.ItemFile is not { } itemFile)
+					return null;
 
-				var text = await ReadFileAsTextAsync(item.ItemFile);
+				var text = await ReadFileAsTextAsync(itemFile);
 				bool isBinaryFile = text.Contains("\0\0\0\0", StringComparison.Ordinal);
 
 				if (isBinaryFile)
@@ -68,7 +70,7 @@ public static async Task<TextPreview> TryLoadAsTextAsync(ListedItem item)
 			}
 		}
 
-		private static bool ExcludedExtensions(string extension)
+		private static bool ExcludedExtensions(string? extension)
 			=> extension is ".iso";
 	}
 }
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
index 8f7b4e101058..608fe95538dd 100644
--- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -29,20 +29,20 @@ public sealed partial class SidebarViewModel : ObservableObject, IDisposable
 		private readonly DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
 		private readonly IFileTagsService fileTagsService;
 
-		private IShellPanesPage paneHolder;
-		public IShellPanesPage PaneHolder
+		private IShellPanesPage? paneHolder;
+		public IShellPanesPage? PaneHolder
 		{
 			get => paneHolder;
 			set => SetProperty(ref paneHolder, value);
 		}
 
-		public MenuFlyout PaneFlyout;
+		public MenuFlyout? PaneFlyout;
 
-		public IFilesystemHelpers FilesystemHelpers
+		public IFilesystemHelpers? FilesystemHelpers
 			=> PaneHolder?.FilesystemHelpers;
 
-		private Microsoft.UI.Dispatching.DispatcherQueue dispatcherQueue;
-		private INavigationControlItem rightClickedItem;
+		private Microsoft.UI.Dispatching.DispatcherQueue? dispatcherQueue;
+		private INavigationControlItem? rightClickedItem;
 		private readonly UISettings uiSettings = new();
 
 		public object SidebarItems => sidebarItems;
@@ -69,7 +69,7 @@ public SidebarDisplayMode SidebarDisplayMode
 			}
 		}
 
-		public delegate void SelectedTagChangedEventHandler(object sender, SelectedTagChangedEventArgs e);
+		public delegate void SelectedTagChangedEventHandler(object? sender, SelectedTagChangedEventArgs e);
 
 		public static event SelectedTagChangedEventHandler? SelectedTagChanged;
 		public static event EventHandler<INavigationControlItem?>? RightClickedItemChanged;
@@ -282,9 +282,9 @@ public bool ShowFileTagsSection
 			}
 		}
 
-		private INavigationControlItem selectedSidebarItem;
+		private INavigationControlItem? selectedSidebarItem;
 
-		public INavigationControlItem SidebarSelectedItem
+		public INavigationControlItem? SidebarSelectedItem
 		{
 			get => selectedSidebarItem;
 			set => SetProperty(ref selectedSidebarItem, value);
@@ -334,7 +334,7 @@ public SidebarViewModel()
 			ReorderItemsCommand = new AsyncRelayCommand(ReorderItemsAsync);
 		}
 
-		private Task<LocationItem> CreateItemHomeAsync()
+		private Task<LocationItem?> CreateItemHomeAsync()
 		{
 			return CreateSectionAsync(SectionType.Home);
 		}
@@ -363,15 +363,17 @@ private void RefreshSectionIcons()
 			}
 		}
 
-		private async void Manager_DataChanged(object sender, NotifyCollectionChangedEventArgs e)
+		private async void Manager_DataChanged(object? sender, NotifyCollectionChangedEventArgs e)
 		{
-			if (dispatcherQueue is null)
+			if (dispatcherQueue is null || sender is not SectionType sectionType)
 				return;
 
 			await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 			{
-				var sectionType = (SectionType)sender;
 				var section = await GetOrCreateSectionAsync(sectionType);
+				if (section is null)
+					return;
+
 				Func<IReadOnlyList<INavigationControlItem>> getElements = () => sectionType switch
 				{
 					SectionType.Pinned => App.QuickAccessManager.Model.PinnedFolderItems,
@@ -381,7 +383,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 					SectionType.WSL => WSLDistroManager.Distros,
 					SectionType.Library => App.LibraryManager.Libraries,
 					SectionType.FileTag => App.FileTagsManager.FileTags,
-					_ => null
+					_ => throw new ArgumentOutOfRangeException(nameof(sectionType), sectionType, "The sidebar section type is not supported.")
 				};
 				await SyncSidebarItemsAsync(section, getElements, e);
 			});
@@ -393,19 +395,22 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 
 		private async Task SyncSidebarItemsAsync(LocationItem section, Func<IReadOnlyList<INavigationControlItem>> getElements, NotifyCollectionChangedEventArgs e)
 		{
-			if (section is null)
-			{
-				return;
-			}
+			var childItems = section.ChildItems!;
 
 			switch (e.Action)
 			{
 				case NotifyCollectionChangedAction.Add:
 					{
-						for (int i = 0; i < e.NewItems.Count; i++)
+						if (e.NewItems is not { } newItems)
+							break;
+
+						for (int i = 0; i < newItems.Count; i++)
 						{
+							if (newItems[i] is not INavigationControlItem item)
+								continue;
+
 							var index = e.NewStartingIndex < 0 ? -1 : i + e.NewStartingIndex;
-							await AddElementToSectionAsync((INavigationControlItem)e.NewItems[i], section, index);
+							await AddElementToSectionAsync(item, section, index);
 						}
 
 						break;
@@ -415,15 +420,18 @@ private async Task SyncSidebarItemsAsync(LocationItem section, Func<IReadOnlyLis
 				case NotifyCollectionChangedAction.Remove:
 				case NotifyCollectionChangedAction.Replace:
 					{
-						foreach (INavigationControlItem elem in e.OldItems)
+						if (e.OldItems is not { } oldItems)
+							break;
+
+						foreach (var elem in oldItems.OfType<INavigationControlItem>())
 						{
-							var match = section.ChildItems.FirstOrDefault(x => x.Path == elem.Path);
+							var match = childItems.FirstOrDefault(x => x.Path == elem.Path);
 							if (match is null)
 								continue;
 							// Tear down the matched item's watcher + descendants before removing it; without this the orphan keeps a live FileSystemWatcher and would fire resyncs into a detached ChildItems collection.
 							if (match is ExpandableSidebarItemBase expandable)
 								expandable.StopWatchingSubfoldersAndDescendants();
-							section.ChildItems.Remove(match);
+							childItems.Remove(match);
 						}
 						if (e.Action != NotifyCollectionChangedAction.Remove)
 						{
@@ -439,13 +447,13 @@ private async Task SyncSidebarItemsAsync(LocationItem section, Func<IReadOnlyLis
 						{
 							await AddElementToSectionAsync(elem, section);
 						}
-						foreach (INavigationControlItem elem in section.ChildItems.ToList())
+						foreach (INavigationControlItem elem in childItems.ToList())
 						{
 							if (!getElements().Any(x => x.Path == elem.Path))
 							{
 								if (elem is ExpandableSidebarItemBase expandable)
 									expandable.StopWatchingSubfoldersAndDescendants();
-								section.ChildItems.Remove(elem);
+								childItems.Remove(elem);
 							}
 						}
 
@@ -459,13 +467,15 @@ private bool IsLibraryOnSidebar(LibraryLocationItem item)
 
 		private async Task AddElementToSectionAsync(INavigationControlItem elem, LocationItem section, int index = -1)
 		{
+			var childItems = section.ChildItems!;
+
 			if (elem is LibraryLocationItem lib)
 			{
 				if (IsLibraryOnSidebar(lib) &&
 					await lib.CheckDefaultSaveFolderAccess() &&
-					!section.ChildItems.Any(x => x.Path == lib.Path))
+					!childItems.Any(x => x.Path == lib.Path))
 				{
-					section.ChildItems.AddSorted(elem);
+					childItems.AddSorted(elem);
 					await lib.LoadLibraryIconAsync();
 				}
 			}
@@ -474,32 +484,33 @@ await lib.CheckDefaultSaveFolderAccess() &&
 				if (section.Section is SectionType.Network or SectionType.CloudDrives)
 				{
 					// Already sorted
-					if (!section.ChildItems.Any(x => x.Path == drive.Path))
+					if (!childItems.Any(x => x.Path == drive.Path))
 					{
-						section.ChildItems.Insert(index < 0 ? section.ChildItems.Count : Math.Min(index, section.ChildItems.Count), drive);
+						childItems.Insert(index < 0 ? childItems.Count : Math.Min(index, childItems.Count), drive);
 						await drive.LoadThumbnailAsync();
 					}
 				}
 				else
 				{
-					string drivePath = drive.Path;
-					var paths = section.ChildItems.Select(item => item.Path).ToList();
+					string drivePath = drive.GetRequiredPath();
+					var paths = childItems.Select(item => item.Path).ToList();
 
 					if (!paths.Contains(drivePath))
 					{
-						paths.AddSorted(drivePath);
-						int position = paths.IndexOf(drivePath);
+						int position = paths.BinarySearch(drivePath, Comparer<string?>.Default);
+						if (position < 0)
+							position = ~position;
 
-						section.ChildItems.Insert(position, drive);
+						childItems.Insert(position, drive);
 						await drive.LoadThumbnailAsync();
 					}
 				}
 			}
 			else
 			{
-				if (!section.ChildItems.Any(x => x.Path == elem.Path))
+				if (!childItems.Any(x => x.Path == elem.Path))
 				{
-					section.ChildItems.Insert(index < 0 ? section.ChildItems.Count : Math.Min(index, section.ChildItems.Count), elem);
+					childItems.Insert(index < 0 ? childItems.Count : Math.Min(index, childItems.Count), elem);
 				}
 			}
 
@@ -525,10 +536,9 @@ private static async Task ApplyTreeViewExpandabilityAsync(INavigationControlItem
 			expandable.HasUnrealizedChildren = hasSubfolders;
 		}
 
-		private async Task<LocationItem> GetOrCreateSectionAsync(SectionType sectionType)
+		private async Task<LocationItem?> GetOrCreateSectionAsync(SectionType sectionType)
 		{
-			LocationItem? section = GetSection(sectionType) ?? await CreateSectionAsync(sectionType);
-			return section;
+			return GetSection(sectionType) ?? await CreateSectionAsync(sectionType);
 		}
 
 		private LocationItem? GetSection(SectionType sectionType)
@@ -536,9 +546,9 @@ private async Task<LocationItem> GetOrCreateSectionAsync(SectionType sectionType
 			return sidebarItems.FirstOrDefault(x => x.Section == sectionType) as LocationItem;
 		}
 
-		private Task<LocationItem> CreateSectionAsync(SectionType sectionType)
+		private Task<LocationItem?> CreateSectionAsync(SectionType sectionType)
 		{
-			LocationItem section = null;
+			LocationItem? section = null;
 
 			switch (sectionType)
 			{
@@ -656,7 +666,7 @@ public async Task UpdateSectionVisibilityAsync(SectionType sectionType, bool sho
 			}
 		}
 
-		private async void UserSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)
+		private async void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)
 		{
 			switch (e.SettingName)
 			{
@@ -767,17 +777,19 @@ public async void HandleItemContextInvokedAsync(object sender, ItemContextInvoke
 			if (args.Item is not INavigationControlItem item)
 			{
 				// We are in the pane context requested path
-				PaneFlyout.ShowAt(sender as FrameworkElement, args.Position);
+				PaneFlyout!.ShowAt(sidebarItem, args.Position);
 
 				return;
 			}
 
 			if (item is FileTagItem tagItem)
 			{
+				var fileTag = tagItem.FileTag
+					?? throw new InvalidOperationException("The sidebar tag item does not have a tag.");
 				var cts = new CancellationTokenSource();
 				var items = new List<(string path, bool isFolder)>();
 
-				await foreach (var taggedItem in fileTagsService.GetItemsForTagAsync(tagItem.FileTag.Uid, cts.Token))
+				await foreach (var taggedItem in fileTagsService.GetItemsForTagAsync(fileTag.Uid, cts.Token))
 				{
 					items.Add((
 						taggedItem.Storable.Id,
@@ -833,7 +845,9 @@ void AddCloseHandlerRecursive(IEnumerable<MenuFlyoutItemBase> menuFlyoutItems)
 
 			secondaryElements.ForEach(itemContextMenuFlyout.SecondaryCommands.Add);
 
-			if (item.MenuOptions.ShowShellItems)
+			var menuOptions = item.MenuOptions
+				?? throw new InvalidOperationException("The sidebar item does not have context-menu options.");
+			if (menuOptions.ShowShellItems)
 				itemContextMenuFlyout.Opened += ItemContextMenuFlyout_Opened;
 
 			itemContextMenuFlyout.ShowAt(sidebarItem, new() { Position = args.Position });
@@ -844,8 +858,12 @@ private async void ItemContextMenuFlyout_Opened(object? sender, object e)
 			if (sender is not CommandBarFlyout itemContextMenuFlyout)
 				return;
 
+			var item = rightClickedItem
+				?? throw new InvalidOperationException("No sidebar item is associated with the context menu.");
+			var itemPath = item.GetRequiredPath();
+
 			itemContextMenuFlyout.Opened -= ItemContextMenuFlyout_Opened;
-			await ShellContextFlyoutFactory.LoadShellMenuItemsAsync(rightClickedItem.Path, itemContextMenuFlyout, rightClickedItem.MenuOptions);
+			await ShellContextFlyoutFactory.LoadShellMenuItemsAsync(itemPath, itemContextMenuFlyout, item.MenuOptions);
 		}
 
 		public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerUpdateKind)
@@ -906,9 +924,9 @@ public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerU
 					}
 
 				case NavigationControlItemType.FileTag:
-					var tagPath = navigationControlItem.Path; // Get the path of the invoked item
 					if (PaneHolder?.ActivePane is IShellPage shp)
 					{
+						var tagPath = navigationControlItem.GetRequiredPath();
 						shp.NavigateToPath(tagPath, new NavigationArguments()
 						{
 							IsSearchResultPage = true,
@@ -949,18 +967,30 @@ public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerU
 
 		private void PinItem()
 		{
-			if (rightClickedItem is DriveItem)
-				_ = QuickAccessService.PinToSidebarAsync(new[] { rightClickedItem.Path });
+			if (rightClickedItem is DriveItem drive)
+			{
+				var path = drive.GetRequiredPath();
+				_ = QuickAccessService.PinToSidebarAsync([path]);
+			}
 		}
+
 		private void UnpinItem()
 		{
-			if (rightClickedItem.Section == SectionType.Pinned || rightClickedItem is DriveItem)
-				_ = QuickAccessService.UnpinFromSidebarAsync(rightClickedItem.Path);
+			var item = rightClickedItem
+				?? throw new InvalidOperationException("No sidebar item is selected for unpinning.");
+			if (item.Section == SectionType.Pinned || item is DriveItem)
+			{
+				var path = item.GetRequiredPath();
+				_ = QuickAccessService.UnpinFromSidebarAsync(path);
+			}
 		}
 
 		private void HideSection()
 		{
-			switch (rightClickedItem.Section)
+			var item = rightClickedItem
+				?? throw new InvalidOperationException("No sidebar section is selected for hiding.");
+
+			switch (item.Section)
 			{
 				case SectionType.Pinned:
 					UserSettingsService.GeneralSettingsService.ShowPinnedSection = false;
@@ -993,19 +1023,28 @@ private async Task ReorderItemsAsync()
 			var result = await dialogService.ShowDialogAsync(dialog);
 		}
 
-		private void OpenProperties(CommandBarFlyout menu)
+		private void OpenProperties(CommandBarFlyout? menu)
 		{
-			EventHandler<object> flyoutClosed = null!;
-			flyoutClosed = async (s, e) =>
+			if (menu is null)
+				return;
+
+			menu.Closed += FlyoutClosed;
+
+			async void FlyoutClosed(object? sender, object e)
 			{
-				menu.Closed -= flyoutClosed;
-				if (rightClickedItem is DriveItem)
-					FilePropertiesHelpers.OpenPropertiesWindow(rightClickedItem, PaneHolder.ActivePane);
-				else if (rightClickedItem is LibraryLocationItem library)
-					FilePropertiesHelpers.OpenPropertiesWindow(new LibraryItem(library), PaneHolder.ActivePane);
-				else if (rightClickedItem is LocationItem locationItem)
+				menu.Closed -= FlyoutClosed;
+				var item = rightClickedItem
+					?? throw new InvalidOperationException("No sidebar item is selected for properties.");
+				var activePane = PaneHolder?.ActivePane
+					?? throw new InvalidOperationException("There is no active pane for sidebar properties.");
+
+				if (item is DriveItem)
+					FilePropertiesHelpers.OpenPropertiesWindow(item, activePane);
+				else if (item is LibraryLocationItem library)
+					FilePropertiesHelpers.OpenPropertiesWindow(new LibraryItem(library), activePane);
+				else if (item is LocationItem locationItem)
 				{
-					var listedItem = new ListedItem(null!)
+					var listedItem = new ListedItem(null)
 					{
 						ItemPath = locationItem.Path,
 						ItemNameRaw = locationItem.Text,
@@ -1013,30 +1052,33 @@ private void OpenProperties(CommandBarFlyout menu)
 						ItemType = Strings.Folder.GetLocalizedResource(),
 					};
 
-					if (!string.Equals(locationItem.Path, Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
+					if (!string.IsNullOrEmpty(locationItem.Path) &&
+						!string.Equals(locationItem.Path, Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
 					{
-						BaseStorageFolder matchingStorageFolder = await PaneHolder.ActivePane.ShellViewModel.GetFolderFromPathAsync(locationItem.Path);
-						if (matchingStorageFolder is not null)
+						var shellViewModel = activePane.GetRequiredShellViewModel();
+						var matchingStorageFolder = await shellViewModel.GetFolderFromPathAsync(locationItem.Path);
+						if (matchingStorageFolder.Result is { } folder)
 						{
-							var syncStatus = await PaneHolder.ActivePane.ShellViewModel.CheckCloudDriveSyncStatusAsync(matchingStorageFolder);
+							var syncStatus = await shellViewModel.CheckCloudDriveSyncStatusAsync(folder);
 							listedItem.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(syncStatus);
 						}
 					}
 
-					FilePropertiesHelpers.OpenPropertiesWindow(listedItem, PaneHolder.ActivePane);
+					FilePropertiesHelpers.OpenPropertiesWindow(listedItem, activePane);
 				}
-			};
-			menu.Closed += flyoutClosed;
+			}
 		}
 
 		private void EjectDevice()
 		{
-			DriveHelpers.EjectDeviceAsync(rightClickedItem.Path);
+			var path = rightClickedItem.GetRequiredPath();
+			DriveHelpers.EjectDeviceAsync(path);
 		}
 
 		private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigationControlItem item, CommandBarFlyout menu)
 		{
-			var options = item.MenuOptions;
+			var options = item.MenuOptions
+				?? throw new InvalidOperationException("The sidebar item does not have context-menu options.");
 			var isSettingsItem = string.Equals(item.Path, "Settings", StringComparison.OrdinalIgnoreCase);
 
 			var pinnedFolderModel = App.QuickAccessManager.Model;
@@ -1159,7 +1201,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = string.Format(Strings.SideBarHideSectionFromSideBarText.GetLocalizedResource(), rightClickedItem.Text),
+					Text = string.Format(Strings.SideBarHideSectionFromSideBarText.GetLocalizedResource(), item.Text),
 					Glyph = "\uE77A",
 					Command = HideSectionCommand,
 					ShowItem = options.ShowHideSection
@@ -1228,7 +1270,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 			{
 				args.RawEvent.Handled = true;
 
-				var isPathNull = string.IsNullOrEmpty(locationItem.Path);
+				var path = locationItem.Path;
+				var isPathNull = string.IsNullOrEmpty(path);
 				var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 				var hasStorageItems = storageItems.Any();
 
@@ -1247,10 +1290,10 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 					}
 				}
 				else if (isPathNull ||
-					(hasStorageItems && storageItems.AreItemsAlreadyInFolder(locationItem.Path)) ||
-					locationItem.Path.StartsWith("Home", StringComparison.OrdinalIgnoreCase) ||
-					locationItem.Path.StartsWith("ReleaseNotes", StringComparison.OrdinalIgnoreCase) ||
-					locationItem.Path.StartsWith("Settings", StringComparison.OrdinalIgnoreCase))
+					(hasStorageItems && storageItems.AreItemsAlreadyInFolder(path!)) ||
+					path!.StartsWith("Home", StringComparison.OrdinalIgnoreCase) ||
+					path.StartsWith("ReleaseNotes", StringComparison.OrdinalIgnoreCase) ||
+					path.StartsWith("Settings", StringComparison.OrdinalIgnoreCase))
 				{
 					rawEvent.AcceptedOperation = DataPackageOperation.None;
 				}
@@ -1262,7 +1305,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 				{
 					string captionText;
 					DataPackageOperation operationType;
-					if (locationItem.Path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
+					if (path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
 					{
 						captionText = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), locationItem.Text);
 						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
@@ -1290,7 +1333,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 						captionText = string.Format(Strings.CopyToFolderCaptionText.GetLocalizedResource(), locationItem.Text);
 						operationType = DataPackageOperation.Copy;
 					}
-					else if (locationItem.IsDefaultLocation || storageItems.AreItemsInSameDrive(locationItem.Path))
+					else if (locationItem.IsDefaultLocation || storageItems.AreItemsInSameDrive(locationItem.Path!))
 					{
 						captionText = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), locationItem.Text);
 						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
@@ -1315,9 +1358,10 @@ private async Task HandleDriveItemDragOverAsync(DriveItem driveItem, ItemDragOve
 
 			var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 			var hasStorageItems = storageItems.Any();
+			var drivePath = driveItem.GetRequiredPath();
 
 			if (Strings.Unknown.GetLocalizedResource().Equals(driveItem.SpaceText, StringComparison.OrdinalIgnoreCase) ||
-				(hasStorageItems && storageItems.AreItemsAlreadyInFolder(driveItem.Path)))
+				(hasStorageItems && storageItems.AreItemsAlreadyInFolder(drivePath)))
 			{
 				args.RawEvent.AcceptedOperation = DataPackageOperation.None;
 			}
@@ -1345,7 +1389,7 @@ private async Task HandleDriveItemDragOverAsync(DriveItem driveItem, ItemDragOve
 					// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
 					operationType = DataPackageOperation.Move | DataPackageOperation.Copy;
 				}
-				else if (storageItems.AreItemsInSameDrive(driveItem.Path))
+				else if (storageItems.AreItemsInSameDrive(drivePath))
 				{
 					captionText = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), driveItem.Text);
 					// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
@@ -1406,14 +1450,20 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 				}
 				else
 				{
-					await FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.DroppedItem, locationItem.Path, false, true);
+					var filesystemHelpers = FilesystemHelpers
+						?? throw new InvalidOperationException("The sidebar does not have filesystem helpers.");
+					var path = locationItem.GetRequiredPath();
+					await filesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.DroppedItem, path, false, true);
 				}
 			}
 		}
 
 		private Task<ReturnResult> HandleDriveItemDroppedAsync(DriveItem driveItem, ItemDroppedEventArgs args)
 		{
-			return FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.RawEvent.DataView, driveItem.Path, false, true);
+			var drivePath = driveItem.GetRequiredPath();
+			var filesystemHelpers = FilesystemHelpers
+				?? throw new InvalidOperationException("The sidebar does not have filesystem helpers.");
+			return filesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.RawEvent.DataView, drivePath, false, true);
 		}
 
 		private async Task HandleTagItemDroppedAsync(FileTagItem fileTagItem, ItemDroppedEventArgs args)
@@ -1421,23 +1471,32 @@ private async Task HandleTagItemDroppedAsync(FileTagItem fileTagItem, ItemDroppe
 			var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 			var dbInstance = FileTagsHelper.GetDbInstance();
 			var pathToTags = new Dictionary<string, string[]>();
-			foreach (var item in storageItems.Where(x => !string.IsNullOrEmpty(x.Path)))
+			foreach (var item in storageItems)
 			{
-				var filesTags = FileTagsHelper.ReadFileTag(item.Path);
-				if (!filesTags.Contains(fileTagItem.FileTag.Uid))
+				if (string.IsNullOrEmpty(item.Path))
+					continue;
+
+				var path = item.Path;
+				var fileTag = fileTagItem.FileTag
+					?? throw new InvalidOperationException("The sidebar tag item does not have a tag.");
+				var filesTags = FileTagsHelper.ReadFileTag(path);
+				if (!filesTags.Contains(fileTag.Uid))
 				{
-					filesTags = [.. filesTags, fileTagItem.FileTag.Uid];
+					filesTags = [.. filesTags, fileTag.Uid];
 					var fileFRN = await FileTagsHelper.GetFileFRN(item.Item);
-					dbInstance.SetTags(item.Path, fileFRN, filesTags);
-					FileTagsHelper.WriteFileTag(item.Path, filesTags);
-					pathToTags[item.Path] = filesTags;
+					dbInstance.SetTags(path, fileFRN, filesTags);
+					FileTagsHelper.WriteFileTag(path, filesTags);
+					pathToTags[path] = filesTags;
 				}
 			}
 
-			if (paneHolder.ActivePane is not null)
+			var paneHolder = PaneHolder
+				?? throw new InvalidOperationException("The sidebar does not have a pane holder.");
+			if (paneHolder.ActivePane is { } activePane)
 			{
-				await paneHolder.ActivePane.ShellViewModel.UpdateItemsTags(pathToTags);
-				await paneHolder.ActivePane.ShellViewModel.RefreshTagGroups();
+				var shellViewModel = activePane.GetRequiredShellViewModel();
+				await shellViewModel.UpdateItemsTags(pathToTags);
+				await shellViewModel.RefreshTagGroups();
 			}
 		}
 
diff --git a/src/Files.App/ViewModels/UserControls/StatusCenterViewModel.cs b/src/Files.App/ViewModels/UserControls/StatusCenterViewModel.cs
index fc8a2e8570a4..483c1a9da803 100644
--- a/src/Files.App/ViewModels/UserControls/StatusCenterViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/StatusCenterViewModel.cs
@@ -98,7 +98,7 @@ public StatusCenterItem AddItem(
 			bool canProvideProgress = true,
 			long itemsCount = 0,
 			long totalSize = 0,
-			CancellationTokenSource cancellationTokenSource = null)
+			CancellationTokenSource? cancellationTokenSource = null)
 		{
 			var banner = new StatusCenterItem(
 				headerResource,
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
index 834c32b103a5..8b02862fdf56 100644
--- a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
@@ -216,7 +216,7 @@ private void ExecuteEjectDeviceCommand(WidgetDriveCardItem? item)
 			if (item is null)
 				return;
 
-			DriveHelpers.EjectDeviceAsync(item.Item.Path);
+			DriveHelpers.EjectDeviceAsync(item.Item.Path!);
 		}
 
 		private void ExecuteOpenPropertiesCommand(WidgetDriveCardItem? item)
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs
index 52cdb1a21e54..49d9a7d52480 100644
--- a/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs
@@ -12,7 +12,7 @@ namespace Files.App.ViewModels.UserControls.Widgets
 	/// </summary>
 	public sealed partial class FileTagsWidgetViewModel : BaseWidgetViewModel, IWidgetViewModel
 	{
-		private CancellationTokenSource _updateCTS;
+		private CancellationTokenSource? _updateCTS;
 		private bool _isInitialized;
 
 		// Properties
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs
index 2fae7f761f36..01ba8ad714b4 100644
--- a/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs
@@ -214,7 +214,7 @@ private void ExecuteEjectDeviceCommand(WidgetDriveCardItem? item)
 			if (item is null)
 				return;
 
-			DriveHelpers.EjectDeviceAsync(item.Item.Path);
+			DriveHelpers.EjectDeviceAsync(item.Item.Path!);
 		}
 
 		private Task ExecuteMapNetworkDriveCommand()
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs
index bf91920ce406..d8e2edaccc57 100644
--- a/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs
@@ -280,38 +280,43 @@ public override async Task ExecuteUnpinFromSidebarCommand(WidgetCardItem? item)
 
 		private void ExecuteOpenPropertiesCommand(WidgetFolderCardItem? item)
 		{
-			if (!HomePageContext.IsAnyItemRightClicked || item is null || item.Item is null)
+			if (!HomePageContext.IsAnyItemRightClicked || item?.Item is null)
 				return;
 
-			var flyout = HomePageContext.ItemContextFlyoutMenu;
-			EventHandler<object> flyoutClosed = null!;
+			var flyout = HomePageContext.ItemContextFlyoutMenu
+				?? throw new InvalidOperationException("The quick-access item context menu is not available.");
 
-			flyoutClosed = async (s, e) =>
+			async void FlyoutClosed(object? sender, object args)
 			{
-				flyout!.Closed -= flyoutClosed;
-
-				ListedItem listedItem = new(null!)
+				flyout.Closed -= FlyoutClosed;
+				var itemPath = item.Path
+					?? throw new InvalidOperationException("The quick-access item does not have a path.");
+				var shellPage = ContentPageContext.ShellPage
+					?? throw new InvalidOperationException("There is no active shell page for quick-access properties.");
+				var shellViewModel = shellPage.GetRequiredShellViewModel();
+
+				ListedItem listedItem = new(null)
 				{
-					ItemPath = item.Path,
+					ItemPath = itemPath,
 					ItemNameRaw = item.Text,
 					PrimaryItemAttribute = StorageItemTypes.Folder,
 					ItemType = Strings.Folder.GetLocalizedResource(),
 				};
 
-				if (!string.Equals(item.Path, Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
+				if (!string.Equals(itemPath, Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
 				{
-					BaseStorageFolder matchingStorageFolder = await ContentPageContext.ShellPage!.ShellViewModel.GetFolderFromPathAsync(item.Path);
+					BaseStorageFolder? matchingStorageFolder = (await shellViewModel.GetFolderFromPathAsync(itemPath)).Result;
 					if (matchingStorageFolder is not null)
 					{
-						var syncStatus = await ContentPageContext.ShellPage!.ShellViewModel.CheckCloudDriveSyncStatusAsync(matchingStorageFolder);
+						var syncStatus = await shellViewModel.CheckCloudDriveSyncStatusAsync(matchingStorageFolder);
 						listedItem.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(syncStatus);
 					}
 				}
 
-				FilePropertiesHelpers.OpenPropertiesWindow(listedItem, ContentPageContext.ShellPage!);
-			};
+				FilePropertiesHelpers.OpenPropertiesWindow(listedItem, shellPage);
+			}
 
-			flyout!.Closed += flyoutClosed;
+			flyout.Closed += FlyoutClosed;
 		}
 
 		// Disposer
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs
index 2b619b2e1abd..146acd25af60 100644
--- a/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs
@@ -307,17 +307,21 @@ private void ExecuteOpenFileLocationCommand(RecentItem? item)
 		{
 			if (item is null)
 				return;
+			var itemPathValue = item.Path
+				?? throw new InvalidOperationException("The recent item does not have a path.");
+			var shellPage = ContentPageContext.ShellPage
+				?? throw new InvalidOperationException("The shell page is not available for opening the file location.");
 
-			var itemPath = Directory.GetParent(item.Path)?.FullName ?? string.Empty;
-			var itemName = Path.GetFileName(item.Path);
+			var itemPath = Directory.GetParent(itemPathValue)?.FullName ?? string.Empty;
+			var itemName = Path.GetFileName(itemPathValue);
 
-			ContentPageContext.ShellPage!.NavigateWithArguments(
-				ContentPageContext.ShellPage!.InstanceViewModel.FolderSettings.GetLayoutType(itemPath),
+			shellPage.NavigateWithArguments(
+				shellPage.InstanceViewModel.FolderSettings.GetLayoutType(itemPath),
 				new NavigationArguments()
 				{
 					NavPathParam = itemPath,
 					SelectItems = new[] { itemName },
-					AssociatedTabInstance = ContentPageContext.ShellPage!
+					AssociatedTabInstance = shellPage
 				});
 		}
 
@@ -327,13 +331,14 @@ private void ExecuteOpenPropertiesCommand(RecentItem? item)
 
 			if (item is null || flyout is null)
 				return;
+			var itemPath = item.Path
+				?? throw new InvalidOperationException("The recent item does not have a path.");
 
-			EventHandler<object> flyoutClosed = null!;
-			flyoutClosed = async (s, e) =>
+			async void FlyoutClosed(object? sender, object args)
 			{
-				flyout!.Closed -= flyoutClosed;
+				flyout.Closed -= FlyoutClosed;
 
-				BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.Path));
+				BaseStorageFile? file = await FilesystemTasks.WrapNullable(() => StorageFileExtensions.DangerousGetFileFromPathAsync(itemPath));
 				if (file is null)
 				{
 					ContentDialog dialog = new()
@@ -350,12 +355,14 @@ private void ExecuteOpenPropertiesCommand(RecentItem? item)
 				}
 				else
 				{
-					var listedItem = await UniversalStorageEnumerator.AddFileAsync(file, null!, default);
-					FilePropertiesHelpers.OpenPropertiesWindow(listedItem, ContentPageContext.ShellPage!);
+					var listedItem = await UniversalStorageEnumerator.AddFileAsync(file, null, default);
+					var shellPage = ContentPageContext.ShellPage
+						?? throw new InvalidOperationException("The shell page is not available for opening properties.");
+					FilePropertiesHelpers.OpenPropertiesWindow(listedItem!, shellPage);
 				}
-			};
+			}
 
-			flyout!.Closed += flyoutClosed;
+			flyout.Closed += FlyoutClosed;
 		}
 
 		// Disposer
diff --git a/src/Files.App/Views/HomePage.xaml.cs b/src/Files.App/Views/HomePage.xaml.cs
index 80da0462deb0..96e2118e5af2 100644
--- a/src/Files.App/Views/HomePage.xaml.cs
+++ b/src/Files.App/Views/HomePage.xaml.cs
@@ -17,7 +17,9 @@ public sealed partial class HomePage : Page, IDisposable
 
 		// Properties
 
-		private IShellPage AppInstance { get; set; } = null!;
+		private IShellPage? appInstance;
+		private IShellPage AppInstance
+			=> appInstance ?? throw new InvalidOperationException("The home page has not been initialized.");
 
 		// Constructor
 
@@ -33,7 +35,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			if (e.Parameter is not NavigationArguments parameters)
 				return;
 
-			AppInstance = parameters.AssociatedTabInstance!;
+			appInstance = parameters.AssociatedTabInstance!;
+			var shellViewModel = AppInstance.GetRequiredShellViewModel();
 
 			AppInstance.InstanceViewModel.IsPageTypeNotHome = false;
 			AppInstance.InstanceViewModel.IsPageTypeSearchResults = false;
@@ -53,8 +56,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			AppInstance.ToolbarViewModel.CanNavigateToParent = false;
 
 			// Set path of working directory empty
-			await AppInstance.ShellViewModel.SetWorkingDirectoryAsync("Home");
-			AppInstance.ShellViewModel.CheckForBackgroundImage();
+			await shellViewModel.SetWorkingDirectoryAsync("Home");
+			shellViewModel.CheckForBackgroundImage();
 
 			AppInstance.SlimContentPage?.StatusBarViewModel.UpdateGitInfo(false, string.Empty, null);
 
diff --git a/src/Files.App/Views/Layouts/BaseGroupableLayoutPage.cs b/src/Files.App/Views/Layouts/BaseGroupableLayoutPage.cs
index 5baf57f29ebd..87680782f3a4 100644
--- a/src/Files.App/Views/Layouts/BaseGroupableLayoutPage.cs
+++ b/src/Files.App/Views/Layouts/BaseGroupableLayoutPage.cs
@@ -55,7 +55,10 @@ public BaseGroupableLayoutPage() : base()
 
 		protected override void InitializeCommandsViewModel()
 		{
-			CommandsViewModel = new BaseLayoutViewModel(ParentShellPageInstance, ItemManipulationModel);
+			var parentShellPage = ParentShellPageInstance
+				?? throw new InvalidOperationException("The layout page must be associated with a shell page before its commands are initialized.");
+
+			CommandsViewModel = new BaseLayoutViewModel(parentShellPage, ItemManipulationModel);
 		}
 
 		protected override void HookEvents()
@@ -129,40 +132,46 @@ protected virtual async void ItemManipulationModel_RefreshItemThumbnail(object?
 
 		protected virtual async Task ReloadSelectedItemIconAsync()
 		{
-			if (ParentShellPageInstance?.SlimContentPage?.SelectedItem is null)
+			var parentShellPage = ParentShellPageInstance;
+			var selectedItem = parentShellPage?.SlimContentPage?.SelectedItem;
+			if (selectedItem is null)
 				return;
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
 
-			ParentShellPageInstance.ShellViewModel.CancelExtendedPropertiesLoading();
-			ParentShellPageInstance.SlimContentPage.SelectedItem.ItemPropertiesInitialized = false;
+			shellViewModel.CancelExtendedPropertiesLoading();
+			selectedItem.ItemPropertiesInitialized = false;
 
-			await ParentShellPageInstance.ShellViewModel.LoadExtendedItemPropertiesAsync(ParentShellPageInstance.SlimContentPage.SelectedItem);
+			await shellViewModel.LoadExtendedItemPropertiesAsync(selectedItem);
 
-			if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None &&
-				ParentShellPageInstance.SlimContentPage.SelectedItem is IGitItem gitItem)
+			if (shellViewModel.EnabledGitProperties is not GitProperties.None &&
+				selectedItem is IGitItem gitItem)
 			{
-				await ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
+				await shellViewModel.LoadGitPropertiesAsync(gitItem);
 			}
 		}
 
 		protected virtual async Task ReloadSelectedItemsIconAsync()
 		{
-			if (ParentShellPageInstance?.SlimContentPage?.SelectedItems is null)
+			var parentShellPage = ParentShellPageInstance;
+			var selectedItems = parentShellPage?.SlimContentPage?.SelectedItems;
+			if (selectedItems is null)
 				return;
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
 
-			ParentShellPageInstance.ShellViewModel.CancelExtendedPropertiesLoading();
+			shellViewModel.CancelExtendedPropertiesLoading();
 
-			foreach (var selectedItem in ParentShellPageInstance.SlimContentPage.SelectedItems)
+			foreach (var selectedItem in selectedItems)
 			{
 				selectedItem.ItemPropertiesInitialized = false;
-				await ParentShellPageInstance.ShellViewModel.LoadExtendedItemPropertiesAsync(selectedItem);
+				await shellViewModel.LoadExtendedItemPropertiesAsync(selectedItem);
 			}
 
-			if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None)
+			if (shellViewModel.EnabledGitProperties is not GitProperties.None)
 			{
-				await Task.WhenAll(ParentShellPageInstance.SlimContentPage.SelectedItems.Select(item =>
+				await Task.WhenAll(selectedItems.Select(item =>
 				{
 					if (item is IGitItem gitItem)
-						return ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
+						return shellViewModel.LoadGitPropertiesAsync(gitItem);
 
 					return Task.CompletedTask;
 				}));
@@ -267,32 +276,36 @@ protected static bool ShouldShowExtensionInRename(ListedItem item) =>
 		protected virtual void StartRenameItem(string itemNameTextBox)
 		{
 			RenamingItem = SelectedItem;
-			if (RenamingItem is null)
+			var renamingItem = RenamingItem;
+			if (renamingItem is null)
 				return;
 
-			int extensionLength = RenamingItem.FileExtension?.Length ?? 0;
+			int extensionLength = renamingItem.FileExtension?.Length ?? 0;
 
-			ListViewItem? listViewItem = ListViewBase.ContainerFromItem(RenamingItem) as ListViewItem;
+			ListViewItem? listViewItem = ListViewBase.ContainerFromItem(renamingItem) as ListViewItem;
 			if (listViewItem is null)
 				return;
 
-			TextBox? textBox = null;
 			TextBlock? textBlock = listViewItem.FindDescendant("ItemName") as TextBlock;
-			textBox = listViewItem.FindDescendant(itemNameTextBox) as TextBox;
-			string editText = ShouldShowExtensionInRename(RenamingItem) ? RenamingItem.ItemNameRaw : textBlock!.Text;
-			textBox!.Text = editText;
+			TextBox? textBox = listViewItem.FindDescendant(itemNameTextBox) as TextBox;
+			if (textBlock is null || textBox is null)
+				throw new InvalidOperationException("The rename controls are not available for the selected item.");
+
+			string editText = ShouldShowExtensionInRename(renamingItem) ? renamingItem.ItemNameRaw! : textBlock.Text;
+			textBox.Text = editText;
 			OldItemName = editText;
-			textBlock!.Visibility = Visibility.Collapsed;
+			textBlock.Visibility = Visibility.Collapsed;
 			textBox.Visibility = Visibility.Visible;
 
-			if (textBox.FindParent<Grid>() is null)
+			var parentGrid = textBox.FindParent<Grid>();
+			if (parentGrid is null)
 			{
 				textBlock.Visibility = Visibility.Visible;
 				textBox.Visibility = Visibility.Collapsed;
 				return;
 			}
 
-			Grid.SetColumnSpan(textBox.FindParent<Grid>(), 8);
+			Grid.SetColumnSpan(parentGrid, 8);
 
 			textBox.Focus(FocusState.Pointer);
 			textBox.LostFocus += RenameTextBox_LostFocus;
@@ -300,7 +313,7 @@ protected virtual void StartRenameItem(string itemNameTextBox)
 
 			int selectedTextLength = editText.Length;
 
-			if (!SelectedItem.IsShortcut && (ShouldShowExtensionInRename(SelectedItem) || UserSettingsService.FoldersSettingsService.ShowFileExtensions))
+			if (!renamingItem.IsShortcut && (ShouldShowExtensionInRename(renamingItem) || UserSettingsService.FoldersSettingsService.ShowFileExtensions))
 				selectedTextLength -= extensionLength;
 
 			textBox.Select(0, selectedTextLength);
@@ -309,10 +322,15 @@ protected virtual void StartRenameItem(string itemNameTextBox)
 
 		protected virtual async Task CommitRenameAsync(TextBox textBox)
 		{
+			var renamingItem = RenamingItem;
+			var parentShellPage = ParentShellPageInstance;
 			EndRename(textBox);
+			if (renamingItem is null || parentShellPage is null)
+				throw new InvalidOperationException("The rename operation does not have an item and shell page.");
+
 			string newItemName = textBox.Text.Trim().TrimEnd('.');
 
-			await UIFilesystemHelpers.RenameFileItemAsync(RenamingItem, newItemName, ParentShellPageInstance, nameIsComplete: ShouldShowExtensionInRename(RenamingItem));
+			await UIFilesystemHelpers.RenameFileItemAsync(renamingItem, newItemName, parentShellPage, nameIsComplete: ShouldShowExtensionInRename(renamingItem));
 		}
 
 		protected virtual async void RenameTextBox_LostFocus(object sender, RoutedEventArgs e)
diff --git a/src/Files.App/Views/Layouts/BaseLayoutPage.cs b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
index 5623035799c9..931669101f4c 100644
--- a/src/Files.App/Views/Layouts/BaseLayoutPage.cs
+++ b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
@@ -37,9 +37,9 @@ public abstract class BaseLayoutPage : Page, IBaseLayoutPage, INotifyPropertyCha
 	{
 		// Dependency injections
 
-		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetService<IFileTagsSettingsService>()!;
-		protected IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>()!;
-		protected ILayoutSettingsService LayoutSettingsService { get; } = Ioc.Default.GetService<ILayoutSettingsService>()!;
+		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
+		protected IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
+		protected ILayoutSettingsService LayoutSettingsService { get; } = Ioc.Default.GetRequiredService<ILayoutSettingsService>();
 		protected ICommandManager Commands { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
 		public InfoPaneViewModel InfoPaneViewModel { get; } = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
 		protected readonly IWindowContext WindowContext = Ioc.Default.GetRequiredService<IWindowContext>();
@@ -185,6 +185,7 @@ public string JumpString
 					value = jumpString;
 				if (value != string.Empty)
 				{
+					var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
 					ListedItem? jumpedToItem = null;
 					ListedItem? previouslySelectedItem = IsItemSelected ? SelectedItem : null;
 
@@ -192,18 +193,26 @@ public string JumpString
 					if (previouslySelectedItem is not null)
 					{
 						// Use FilesAndFolders because only displayed entries should be jumped to
-						IEnumerable<ListedItem> candidateItems = ParentShellPageInstance!.ShellViewModel.FilesAndFolders.ToList()
+						IEnumerable<ListedItem> candidateItems = shellViewModel.FilesAndFolders.ToList()
 							.SkipWhile(x => x != previouslySelectedItem)
 							.Skip(value.Length == 1 ? 1 : 0) // User is trying to cycle through items starting with the same letter
-							.Where(f => f.Name.Length >= value.Length && string.Equals(f.Name.Substring(0, value.Length), value, StringComparison.OrdinalIgnoreCase));
+							.Where(f =>
+							{
+								var name = f.Name ?? throw new InvalidOperationException("A listed item does not have a name.");
+								return name.Length >= value.Length && string.Equals(name.Substring(0, value.Length), value, StringComparison.OrdinalIgnoreCase);
+							});
 						jumpedToItem = candidateItems.FirstOrDefault();
 					}
 
 					if (jumpedToItem is null)
 					{
 						// Use FilesAndFolders because only displayed entries should be jumped to
-						IEnumerable<ListedItem> candidateItems = ParentShellPageInstance!.ShellViewModel.FilesAndFolders.ToList()
-							.Where(f => f.Name.Length >= value.Length && string.Equals(f.Name.Substring(0, value.Length), value, StringComparison.OrdinalIgnoreCase));
+						IEnumerable<ListedItem> candidateItems = shellViewModel.FilesAndFolders.ToList()
+							.Where(f =>
+							{
+								var name = f.Name ?? throw new InvalidOperationException("A listed item does not have a name.");
+								return name.Length >= value.Length && string.Equals(name.Substring(0, value.Length), value, StringComparison.OrdinalIgnoreCase);
+							});
 						jumpedToItem = candidateItems.FirstOrDefault();
 					}
 
@@ -224,22 +233,27 @@ public string JumpString
 
 		private bool isSelectedItemsSorted = false;
 		private List<ListedItem>? selectedItems = [];
-		public List<ListedItem>? SelectedItems
+		public List<ListedItem> SelectedItems
 		{
 			get
 			{
+				var currentItems = selectedItems
+					?? throw new InvalidOperationException("The selected items collection has not been initialized.");
 				if (!isSelectedItemsSorted)
 				{
-					var orderedItems = SortingHelper.OrderFileList(selectedItems, FolderSettings.DirectorySortOption, FolderSettings.DirectorySortDirection, FolderSettings.SortDirectoriesAlongsideFiles, FolderSettings.SortFilesFirst).ToList();
+					var folderSettings = FolderSettings
+						?? throw new InvalidOperationException("The layout does not have folder settings.");
+					var orderedItems = SortingHelper.OrderFileList(currentItems, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles, folderSettings.SortFilesFirst).ToList();
 					selectedItems = orderedItems;
+					currentItems = orderedItems;
 					isSelectedItemsSorted = true;
 				}
 
-				return SelectedItem is null || !selectedItems!.Contains(SelectedItem)
-					? selectedItems
-					: selectedItems
+				return SelectedItem is null || !currentItems.Contains(SelectedItem)
+					? currentItems
+					: currentItems
 						.SkipWhile(x => x != SelectedItem)
-						.Concat(selectedItems.TakeWhile(x => x != SelectedItem))
+						.Concat(currentItems.TakeWhile(x => x != SelectedItem))
 						.ToList();
 			}
 			internal set
@@ -248,8 +262,9 @@ internal set
 				{
 					isSelectedItemsSorted = false;
 					selectedItems = value;
+					var currentItems = value;
 
-					if (selectedItems?.Count == 0 || selectedItems?[0] is null)
+					if (currentItems.Count == 0)
 					{
 						IsItemSelected = false;
 						SelectedItem = null;
@@ -258,18 +273,18 @@ internal set
 						ResetRenameDoubleClick();
 						UpdateSelectionSize();
 					}
-					else if (selectedItems is not null)
+					else
 					{
 						IsItemSelected = true;
-						SelectedItem = selectedItems.First();
+						SelectedItem = currentItems.First();
 						SelectedItemsPropertiesViewModel.IsItemSelected = true;
 
 						UpdateSelectionSize();
 
-						SelectedItemsPropertiesViewModel.SelectedItemsCount = selectedItems.Count;
-						SelectedItemsPropertiesViewModel.SelectedItemsCountString = Strings.SelectedItems.GetLocalizedFormatResource(selectedItems!.Count);
+						SelectedItemsPropertiesViewModel.SelectedItemsCount = currentItems.Count;
+						SelectedItemsPropertiesViewModel.SelectedItemsCountString = Strings.SelectedItems.GetLocalizedFormatResource(currentItems.Count);
 
-						if (selectedItems.Count == 1)
+						if (currentItems.Count == 1)
 						{
 							DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 							{
@@ -285,7 +300,11 @@ internal set
 					NotifyPropertyChanged(nameof(SelectedItems));
 				}
 				if (!isDraggingSelectionRectangle)
-					ParentShellPageInstance!.ToolbarViewModel.SelectedItems = value;
+				{
+					var parentShellPage = ParentShellPageInstance
+						?? throw new InvalidOperationException("The layout does not have a parent shell page.");
+					parentShellPage.ToolbarViewModel.SelectedItems = value;
+				}
 			}
 		}
 
@@ -343,7 +362,7 @@ private void JumpTimer_Tick(object sender, object e)
 			jumpTimer.Stop();
 		}
 
-		protected IEnumerable<ListedItem>? GetAllItems()
+		protected IEnumerable<ListedItem> GetAllItems()
 		{
 			var items = CollectionViewSource.IsSourceGrouped
 				? (CollectionViewSource.Source as BulkConcurrentObservableCollection<GroupedCollection<ListedItem>>)?.SelectMany(g => g) // add all items from each group to the new list
@@ -375,31 +394,37 @@ public virtual void ResetItemOpacity()
 
 		protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object? sender, LayoutModeEventArgs e)
 		{
-			if (ParentShellPageInstance?.SlimContentPage is not null)
+			if (ParentShellPageInstance is { SlimContentPage: not null } parentShellPage)
 			{
-				var layoutType = FolderSettings!.GetLayoutType(ParentShellPageInstance.ShellViewModel.WorkingDirectory);
+				var shellViewModel = parentShellPage.GetRequiredShellViewModel();
+				var folderSettings = parentShellPage.InstanceViewModel.FolderSettings;
+				var workingDirectory = shellViewModel.WorkingDirectory
+					?? throw new InvalidOperationException("The shell page does not have a working directory.");
+				var layoutType = folderSettings.GetLayoutType(workingDirectory);
 
-				if (layoutType != ParentShellPageInstance.CurrentPageType)
+				if (layoutType != parentShellPage.CurrentPageType)
 				{
-					FolderSettings!.PendingLayoutSwitchSelection = SelectedItems?.Select(item => item.ItemNameRaw).ToList();
+					var args = navigationArguments
+						?? throw new InvalidOperationException("The layout navigation arguments are not available.");
+					folderSettings.PendingLayoutSwitchSelection = SelectedItems.Select(item => item.ItemNameRaw!).ToList();
 
-					ParentShellPageInstance.NavigateWithArguments(layoutType, new NavigationArguments()
+					parentShellPage.NavigateWithArguments(layoutType, new NavigationArguments()
 					{
-						NavPathParam = navigationArguments!.NavPathParam,
-						IsSearchResultPage = navigationArguments.IsSearchResultPage,
-						SearchPathParam = navigationArguments.SearchPathParam,
-						SearchQuery = navigationArguments.SearchQuery,
+						NavPathParam = args.NavPathParam,
+						IsSearchResultPage = args.IsSearchResultPage,
+						SearchPathParam = args.SearchPathParam,
+						SearchQuery = args.SearchQuery,
 						IsLayoutSwitch = true,
-						AssociatedTabInstance = ParentShellPageInstance
+						AssociatedTabInstance = parentShellPage
 					});
 
 					// Remove old layout from back stack
-					ParentShellPageInstance.RemoveLastPageFromBackStack();
-					ParentShellPageInstance.ResetNavigationStackLayoutMode();
+					parentShellPage.RemoveLastPageFromBackStack();
+					parentShellPage.ResetNavigationStackLayoutMode();
 				}
 
-				ParentShellPageInstance.ShellViewModel.UpdateEmptyTextType();
-				ParentShellPageInstance.ShellViewModel.UpdateNetworkAvailabilityInfoBar();
+				shellViewModel.UpdateEmptyTextType();
+				shellViewModel.UpdateNetworkAvailabilityInfoBar();
 
 				// Focus on the active pane in case it was lost during the layout switch.
 				// Allthough the focus is also set from SetSelectedItemsOnNavigation,
@@ -408,7 +433,10 @@ protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object? send
 				// Adaptive layout fires this handler on folder-load completion - skip the focus
 				// restore so an in-progress omnibar query isn't lost.
 				if (!UIHelpers.IsTextInputFocused(XamlRoot))
-					ParentShellPageInstance!.PaneHolder.FocusActivePane();
+				{
+					var paneHolder = parentShellPage.GetRequiredPaneHolder();
+					paneHolder.FocusActivePane();
+				}
 			}
 		}
 
@@ -424,102 +452,111 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			// Add item jumping handler
 			CharacterReceived += Page_CharacterReceived;
 
-			navigationArguments = (NavigationArguments)e.Parameter;
-			ParentShellPageInstance = navigationArguments.AssociatedTabInstance;
+			if (e.Parameter is not NavigationArguments { AssociatedTabInstance: { } parentShellPage } args ||
+				parentShellPage.ShellViewModel is not { } shellViewModel)
+			{
+				throw new InvalidOperationException("Layout navigation requires an initialized shell page.");
+			}
+
+			navigationArguments = args;
+			ParentShellPageInstance = parentShellPage;
+			var folderSettings = parentShellPage.InstanceViewModel.FolderSettings;
 
 			// Git properties are not loaded by default
-			ParentShellPageInstance.ShellViewModel.EnabledGitProperties = GitProperties.None;
+			shellViewModel.EnabledGitProperties = GitProperties.None;
 
 			InitializeCommandsViewModel();
 
 			IsItemSelected = false;
 
-			FolderSettings!.LayoutModeChangeRequested += BaseFolderSettings_LayoutModeChangeRequested;
-			FolderSettings.GroupOptionPreferenceUpdated += FolderSettings_GroupOptionPreferenceUpdated;
-			FolderSettings.GroupDirectionPreferenceUpdated += FolderSettings_GroupDirectionPreferenceUpdated;
-			FolderSettings.GroupByDateUnitPreferenceUpdated += FolderSettings_GroupByDateUnitPreferenceUpdated;
+			folderSettings.LayoutModeChangeRequested += BaseFolderSettings_LayoutModeChangeRequested;
+			folderSettings.GroupOptionPreferenceUpdated += FolderSettings_GroupOptionPreferenceUpdated;
+			folderSettings.GroupDirectionPreferenceUpdated += FolderSettings_GroupDirectionPreferenceUpdated;
+			folderSettings.GroupByDateUnitPreferenceUpdated += FolderSettings_GroupByDateUnitPreferenceUpdated;
 
-			ParentShellPageInstance.ShellViewModel.EmptyTextType = EmptyTextType.None;
-			ParentShellPageInstance.ToolbarViewModel.CanRefresh = true;
+			shellViewModel.EmptyTextType = EmptyTextType.None;
+			parentShellPage.ToolbarViewModel.CanRefresh = true;
 
-			if (!navigationArguments.IsSearchResultPage)
+			if (!args.IsSearchResultPage)
 			{
-				var previousDir = ParentShellPageInstance.ShellViewModel.WorkingDirectory;
-				await ParentShellPageInstance.ShellViewModel.SetWorkingDirectoryAsync(navigationArguments.NavPathParam);
+				var navigationPath = args.NavPathParam;
+				var previousDir = shellViewModel.WorkingDirectory;
+				await shellViewModel.SetWorkingDirectoryAsync(navigationPath);
 
 				// pathRoot will be empty on recycle bin path
-				var workingDir = ParentShellPageInstance.ShellViewModel.WorkingDirectory ?? string.Empty;
+				var workingDir = shellViewModel.WorkingDirectory ?? string.Empty;
 				var pathRoot = GetPathRoot(workingDir);
 
 				var isRecycleBin = workingDir.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeRecycleBin = isRecycleBin;
+				parentShellPage.InstanceViewModel.IsPageTypeRecycleBin = isRecycleBin;
 
 				// Can't go up from recycle bin
-				ParentShellPageInstance.ToolbarViewModel.CanNavigateToParent = !(string.IsNullOrEmpty(pathRoot) || isRecycleBin);
-
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeMtpDevice = workingDir.StartsWith("\\\\?\\", StringComparison.Ordinal);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeFtp = FtpHelpers.IsFtpPath(workingDir);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeZipFolder = ZipStorageFolder.IsZipPath(workingDir);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeLibrary = LibraryManager.IsLibraryPath(workingDir);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeSearchResults = false;
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeReleaseNotes = false;
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeSettings = false;
-				ParentShellPageInstance.ToolbarViewModel.PathControlDisplayText = navigationArguments.NavPathParam;
-
-				if (ParentShellPageInstance.InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.Path)
-					ParentShellPageInstance.InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.Name;
-
-				if (ParentShellPageInstance.InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.FolderPath &&
-					!ParentShellPageInstance.InstanceViewModel.IsPageTypeLibrary)
-					ParentShellPageInstance.InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.None;
-
-				if (!navigationArguments.IsLayoutSwitch || previousDir != workingDir)
-					ParentShellPageInstance.ShellViewModel.RefreshItems(previousDir, SetSelectedItemsOnNavigation);
+				parentShellPage.ToolbarViewModel.CanNavigateToParent = !(string.IsNullOrEmpty(pathRoot) || isRecycleBin);
+
+				parentShellPage.InstanceViewModel.IsPageTypeMtpDevice = workingDir.StartsWith("\\\\?\\", StringComparison.Ordinal);
+				parentShellPage.InstanceViewModel.IsPageTypeFtp = FtpHelpers.IsFtpPath(workingDir);
+				parentShellPage.InstanceViewModel.IsPageTypeZipFolder = ZipStorageFolder.IsZipPath(workingDir);
+				parentShellPage.InstanceViewModel.IsPageTypeLibrary = LibraryManager.IsLibraryPath(workingDir);
+				parentShellPage.InstanceViewModel.IsPageTypeSearchResults = false;
+				parentShellPage.InstanceViewModel.IsPageTypeReleaseNotes = false;
+				parentShellPage.InstanceViewModel.IsPageTypeSettings = false;
+				parentShellPage.ToolbarViewModel.PathControlDisplayText = navigationPath;
+
+				if (folderSettings.DirectorySortOption == SortOption.Path)
+					folderSettings.DirectorySortOption = SortOption.Name;
+
+				if (folderSettings.DirectoryGroupOption == GroupOption.FolderPath &&
+					!parentShellPage.InstanceViewModel.IsPageTypeLibrary)
+					folderSettings.DirectoryGroupOption = GroupOption.None;
+
+				if (!args.IsLayoutSwitch || previousDir != workingDir)
+					shellViewModel.RefreshItems(previousDir, SetSelectedItemsOnNavigation);
 				else
-					ParentShellPageInstance.ToolbarViewModel.CanGoForward = false;
+					parentShellPage.ToolbarViewModel.CanGoForward = false;
 			}
 			else
 			{
-				await ParentShellPageInstance.ShellViewModel.SetWorkingDirectoryAsync(navigationArguments.SearchPathParam);
+				var searchPath = args.SearchPathParam;
+				await shellViewModel.SetWorkingDirectoryAsync(searchPath);
 
-				ParentShellPageInstance.ToolbarViewModel.CanGoForward = false;
+				parentShellPage.ToolbarViewModel.CanGoForward = false;
 
 				// Impose no artificial restrictions on back navigation. Even in a search results page.
-				ParentShellPageInstance.ToolbarViewModel.CanGoBack = true;
+				parentShellPage.ToolbarViewModel.CanGoBack = true;
 
-				ParentShellPageInstance.ToolbarViewModel.CanNavigateToParent = false;
+				parentShellPage.ToolbarViewModel.CanNavigateToParent = false;
 
-				var workingDir = ParentShellPageInstance.ShellViewModel.WorkingDirectory ?? string.Empty;
+				var workingDir = shellViewModel.WorkingDirectory ?? string.Empty;
 
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeRecycleBin = workingDir.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeMtpDevice = workingDir.StartsWith("\\\\?\\", StringComparison.Ordinal);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeFtp = FtpHelpers.IsFtpPath(workingDir);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeZipFolder = ZipStorageFolder.IsZipPath(workingDir);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeLibrary = LibraryManager.IsLibraryPath(workingDir);
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeSearchResults = true;
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeReleaseNotes = false;
-				ParentShellPageInstance.InstanceViewModel.IsPageTypeSettings = false;
+				parentShellPage.InstanceViewModel.IsPageTypeRecycleBin = workingDir.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal);
+				parentShellPage.InstanceViewModel.IsPageTypeMtpDevice = workingDir.StartsWith("\\\\?\\", StringComparison.Ordinal);
+				parentShellPage.InstanceViewModel.IsPageTypeFtp = FtpHelpers.IsFtpPath(workingDir);
+				parentShellPage.InstanceViewModel.IsPageTypeZipFolder = ZipStorageFolder.IsZipPath(workingDir);
+				parentShellPage.InstanceViewModel.IsPageTypeLibrary = LibraryManager.IsLibraryPath(workingDir);
+				parentShellPage.InstanceViewModel.IsPageTypeSearchResults = true;
+				parentShellPage.InstanceViewModel.IsPageTypeReleaseNotes = false;
+				parentShellPage.InstanceViewModel.IsPageTypeSettings = false;
 
-				if (!navigationArguments.IsLayoutSwitch)
+				if (!args.IsLayoutSwitch)
 				{
-					var displayName = App.LibraryManager.TryGetLibrary(navigationArguments.SearchPathParam, out var lib) ? lib.Text : navigationArguments.SearchPathParam;
-					await ParentShellPageInstance.UpdatePathUIToWorkingDirectoryAsync(null, string.Format(Strings.SearchPagePathBoxOverrideText.GetLocalizedResource(), navigationArguments.SearchQuery, displayName));
+					var displayName = App.LibraryManager.TryGetLibrary(searchPath, out var lib) ? lib.Text : searchPath;
+					await parentShellPage.UpdatePathUIToWorkingDirectoryAsync(null, string.Format(Strings.SearchPagePathBoxOverrideText.GetLocalizedResource(), args.SearchQuery, displayName));
 					var searchInstance = new Utils.Storage.FolderSearch
 					{
-						Query = navigationArguments.SearchQuery,
-						Folder = navigationArguments.SearchPathParam,
+						Query = args.SearchQuery,
+						Folder = searchPath,
 					};
 
-					_ = ParentShellPageInstance.ShellViewModel.SearchAsync(searchInstance);
+					_ = shellViewModel.SearchAsync(searchInstance);
 				}
 			}
 
 			// Show controls that were hidden on the home page
-			ParentShellPageInstance.InstanceViewModel.IsPageTypeNotHome = true;
-			ParentShellPageInstance.ShellViewModel.UpdateGroupOptions();
+			parentShellPage.InstanceViewModel.IsPageTypeNotHome = true;
+			shellViewModel.UpdateGroupOptions();
 
 			UpdateCollectionViewSource();
-			FolderSettings.IsLayoutModeChanging = false;
+			folderSettings.IsLayoutModeChanging = false;
 
 			SetSelectedItemsOnNavigation();
 
@@ -549,9 +586,12 @@ public async void SetSelectedItemsOnNavigation()
 					itemsToSelect is not null &&
 					itemsToSelect.Any())
 				{
+					if (ParentShellPageInstance?.ShellViewModel is not { } shellViewModel)
+						return;
+
 					List<ListedItem> listedItemsToSelect =
 					[
-						.. ParentShellPageInstance!.ShellViewModel.FilesAndFolders.ToList().Where((li) => itemsToSelect.Contains(li.ItemNameRaw)),
+						.. shellViewModel.FilesAndFolders.ToList().Where((li) => itemsToSelect.Contains(li.ItemNameRaw)),
 					];
 
 					ItemManipulationModel.SetSelectedItems(listedItemsToSelect);
@@ -563,10 +603,12 @@ itemsToSelect is not null &&
 					if (!UIHelpers.IsTextInputFocused(XamlRoot))
 						ItemManipulationModel.FocusSelectedItems();
 				}
-				else if (navigationArguments is not null && ParentShellPageInstance!.InstanceViewModel.FolderSettings.LayoutMode is not FolderLayoutModes.ColumnView)
+				else if (navigationArguments is not null &&
+					ParentShellPageInstance is { } parentShellPage &&
+					parentShellPage.InstanceViewModel.FolderSettings.LayoutMode is not FolderLayoutModes.ColumnView)
 				{
 					if (!UIHelpers.IsTextInputFocused(XamlRoot))
-						ParentShellPageInstance!.PaneHolder.FocusActivePane();
+						parentShellPage.PaneHolder?.FocusActivePane();
 				}
 			}
 			catch (Exception) { }
@@ -589,16 +631,18 @@ private async void FolderSettings_GroupByDateUnitPreferenceUpdated(object? sende
 
 		private async Task GroupPreferenceUpdatedAsync()
 		{
+			var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+
 			// Two or more of these running at the same time will cause a crash, so cancel the previous one before beginning
 			groupingCancellationToken?.Cancel();
 			groupingCancellationToken = new CancellationTokenSource();
 			var token = groupingCancellationToken.Token;
 
-			await ParentShellPageInstance!.ShellViewModel.GroupOptionsUpdatedAsync(token);
+			await shellViewModel.GroupOptionsUpdatedAsync(token);
 
 			UpdateCollectionViewSource();
 
-			await ParentShellPageInstance.ShellViewModel.ReloadItemGroupHeaderImagesAsync();
+			await shellViewModel.ReloadItemGroupHeaderImagesAsync();
 		}
 
 		protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -607,16 +651,21 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 
 			// Remove item jumping handler
 			CharacterReceived -= Page_CharacterReceived;
-			FolderSettings!.LayoutModeChangeRequested -= BaseFolderSettings_LayoutModeChangeRequested;
-			FolderSettings.GroupOptionPreferenceUpdated -= FolderSettings_GroupOptionPreferenceUpdated;
-			FolderSettings.GroupDirectionPreferenceUpdated -= FolderSettings_GroupDirectionPreferenceUpdated;
-			FolderSettings.GroupByDateUnitPreferenceUpdated -= FolderSettings_GroupByDateUnitPreferenceUpdated;
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The layout does not have folder settings.");
+			folderSettings.LayoutModeChangeRequested -= BaseFolderSettings_LayoutModeChangeRequested;
+			folderSettings.GroupOptionPreferenceUpdated -= FolderSettings_GroupOptionPreferenceUpdated;
+			folderSettings.GroupDirectionPreferenceUpdated -= FolderSettings_GroupDirectionPreferenceUpdated;
+			folderSettings.GroupByDateUnitPreferenceUpdated -= FolderSettings_GroupByDateUnitPreferenceUpdated;
 			ItemContextMenuFlyout.Opening -= ItemContextFlyout_Opening;
 			BaseContextMenuFlyout.Opening -= BaseContextFlyout_Opening;
 
 			var parameter = e.Parameter as NavigationArguments;
 			if (parameter is not null && !parameter.IsLayoutSwitch)
-				ParentShellPageInstance!.ShellViewModel.CancelLoadAndClearFiles();
+			{
+				var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+				shellViewModel.CancelLoadAndClearFiles();
+			}
 		}
 
 		private async void ItemContextFlyout_Opening(object? sender, object e)
@@ -625,10 +674,17 @@ private async void ItemContextFlyout_Opening(object? sender, object e)
 
 			try
 			{
-				if (!ParentShellPageInstance!.IsCurrentInstance || !ParentShellPageInstance.IsCurrentPane)
+				var parentShellPage = ParentShellPageInstance
+					?? throw new InvalidOperationException("The layout does not have a parent shell page.");
+				var shellViewModel = parentShellPage.GetRequiredShellViewModel();
+				var commandsViewModel = CommandsViewModel
+					?? throw new InvalidOperationException("The layout commands are not initialized.");
+
+				var instanceViewModel = parentShellPage.InstanceViewModel;
+				if (!parentShellPage.IsCurrentInstance || !parentShellPage.IsCurrentPane)
 				{
 					// Wait until the pane and column become current
-					await Task.WhenAny(ParentShellPageInstance.WhenIsCurrent(), Task.Delay(500));
+					await Task.WhenAny(parentShellPage.WhenIsCurrent(), Task.Delay(500));
 					// Wait a little longer to ensure the page context is updated
 					await Task.Delay(10);
 				}
@@ -645,10 +701,10 @@ private async void ItemContextFlyout_Opening(object? sender, object e)
 
 					shellContextMenuItemCancellationToken?.Cancel();
 					shellContextMenuItemCancellationToken = new CancellationTokenSource();
-					SelectedItemsPropertiesViewModel.CheckAllFileExtensions(SelectedItems!.Select(selectedItem => selectedItem?.FileExtension).ToList()!);
+					SelectedItemsPropertiesViewModel.CheckAllFileExtensions(SelectedItems.Select(selectedItem => selectedItem?.FileExtension).ToList());
 
 					shiftPressed = Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down);
-					var items = ContentPageContextFlyoutFactory.GetItemContextCommandsWithoutShellItems(currentInstanceViewModel: InstanceViewModel!, selectedItems: SelectedItems!, selectedItemsPropertiesViewModel: SelectedItemsPropertiesViewModel, commandsViewModel: CommandsViewModel!, shiftPressed: shiftPressed, itemViewModel: null);
+					var items = ContentPageContextFlyoutFactory.GetItemContextCommandsWithoutShellItems(currentInstanceViewModel: instanceViewModel, selectedItems: SelectedItems, selectedItemsPropertiesViewModel: SelectedItemsPropertiesViewModel, commandsViewModel: commandsViewModel, shiftPressed: shiftPressed, itemViewModel: null);
 
 					ItemContextMenuFlyout.PrimaryCommands.Clear();
 					ItemContextMenuFlyout.SecondaryCommands.Clear();
@@ -659,12 +715,12 @@ private async void ItemContextFlyout_Opening(object? sender, object e)
 					secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width
 					secondaryElements.ForEach(ItemContextMenuFlyout.SecondaryCommands.Add);
 
-					if (InstanceViewModel!.CanTagFilesInPage)
+					if (instanceViewModel.CanTagFilesInPage)
 						AddNewFileTagsToMenu(ItemContextMenuFlyout);
 
-					if (!InstanceViewModel.IsPageTypeZipFolder && !InstanceViewModel.IsPageTypeFtp)
+					if (!instanceViewModel.IsPageTypeZipFolder && !instanceViewModel.IsPageTypeFtp)
 					{
-						var shellMenuItems = await ContentPageContextFlyoutFactory.GetItemContextShellCommandsAsync(workingDir: ParentShellPageInstance.ShellViewModel.WorkingDirectory, selectedItems: SelectedItems!, shiftPressed: shiftPressed, showOpenMenu: false, shellContextMenuItemCancellationToken.Token);
+						var shellMenuItems = await ContentPageContextFlyoutFactory.GetItemContextShellCommandsAsync(workingDir: shellViewModel.WorkingDirectory, selectedItems: SelectedItems, shiftPressed: shiftPressed, showOpenMenu: false, shellContextMenuItemCancellationToken.Token);
 						if (shellMenuItems.Any())
 							await AddShellMenuItemsAsync(shellMenuItems, ItemContextMenuFlyout, shiftPressed);
 						else
@@ -688,10 +744,17 @@ private async void BaseContextFlyout_Opening(object? sender, object e)
 
 			try
 			{
-				if (!ParentShellPageInstance!.IsCurrentInstance || !ParentShellPageInstance.IsCurrentPane)
+				var parentShellPage = ParentShellPageInstance
+					?? throw new InvalidOperationException("The layout does not have a parent shell page.");
+				var shellViewModel = parentShellPage.GetRequiredShellViewModel();
+				var commandsViewModel = CommandsViewModel
+					?? throw new InvalidOperationException("The layout commands are not initialized.");
+
+				var instanceViewModel = parentShellPage.InstanceViewModel;
+				if (!parentShellPage.IsCurrentInstance || !parentShellPage.IsCurrentPane)
 				{
 					// Wait until the pane and column become current
-					await Task.WhenAny(ParentShellPageInstance.WhenIsCurrent(), Task.Delay(500));
+					await Task.WhenAny(parentShellPage.WhenIsCurrent(), Task.Delay(500));
 					// Wait a little longer to ensure the page context is updated
 					await Task.Delay(10);
 				}
@@ -706,7 +769,10 @@ private async void BaseContextFlyout_Opening(object? sender, object e)
 				shellContextMenuItemCancellationToken = new CancellationTokenSource();
 
 				shiftPressed = Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down);
-				var items = ContentPageContextFlyoutFactory.GetItemContextCommandsWithoutShellItems(currentInstanceViewModel: InstanceViewModel!, selectedItems: [ParentShellPageInstance!.ShellViewModel.CurrentFolder], commandsViewModel: CommandsViewModel!, shiftPressed: shiftPressed, itemViewModel: ParentShellPageInstance!.ShellViewModel, selectedItemsPropertiesViewModel: null);
+				var currentFolder = shellViewModel.CurrentFolder
+					?? throw new InvalidOperationException("The current folder is not available.");
+				List<ListedItem> contextItems = [currentFolder];
+				var items = ContentPageContextFlyoutFactory.GetItemContextCommandsWithoutShellItems(currentInstanceViewModel: instanceViewModel, selectedItems: contextItems, commandsViewModel: commandsViewModel, shiftPressed: shiftPressed, itemViewModel: shellViewModel, selectedItemsPropertiesViewModel: null);
 
 				BaseContextMenuFlyout.PrimaryCommands.Clear();
 				BaseContextMenuFlyout.SecondaryCommands.Clear();
@@ -721,9 +787,9 @@ private async void BaseContextFlyout_Opening(object? sender, object e)
 				secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth);
 				secondaryElements.ForEach(i => BaseContextMenuFlyout.SecondaryCommands.Add(i));
 
-				if (!InstanceViewModel!.IsPageTypeSearchResults && !InstanceViewModel.IsPageTypeZipFolder && !InstanceViewModel.IsPageTypeFtp)
+				if (!instanceViewModel.IsPageTypeSearchResults && !instanceViewModel.IsPageTypeZipFolder && !instanceViewModel.IsPageTypeFtp)
 				{
-					var shellMenuItems = await ContentPageContextFlyoutFactory.GetItemContextShellCommandsAsync(workingDir: ParentShellPageInstance.ShellViewModel.WorkingDirectory, selectedItems: [], shiftPressed: shiftPressed, showOpenMenu: false, shellContextMenuItemCancellationToken.Token);
+					var shellMenuItems = await ContentPageContextFlyoutFactory.GetItemContextShellCommandsAsync(workingDir: shellViewModel.WorkingDirectory, selectedItems: [], shiftPressed: shiftPressed, showOpenMenu: false, shellContextMenuItemCancellationToken.Token);
 					if (shellMenuItems.Any())
 						await AddShellMenuItemsAsync(shellMenuItems, BaseContextMenuFlyout, shiftPressed);
 					else
@@ -816,7 +882,10 @@ private void AddNewFileTagsToMenu(CommandBarFlyout contextMenu)
 			async void RequireTagGroupsUpdate(object? sender, EventArgs e)
 			{
 				if (ParentShellPageInstance is not null)
-					await ParentShellPageInstance.ShellViewModel.RefreshTagGroups();
+				{
+					var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+					await shellViewModel.RefreshTagGroups();
+				}
 			}
 
 			void HandleClosed(object? sender, object e)
@@ -842,10 +911,10 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
 
 			var subMenuLoadTasks = mainShellMenuItems.Concat(overflowShellMenuItems)
 				.Where(x => x.LoadSubMenuAction is not null)
-				.Select(x => x.LoadSubMenuAction());
+				.Select(x => x.LoadSubMenuAction!());
 			await Task.WhenAll(subMenuLoadTasks);
 
-			var overflowItems = ContextFlyoutModelToElementHelper.GetMenuFlyoutItemsFromModel(overflowShellMenuItems);
+			var overflowItems = ContextFlyoutModelToElementHelper.GetMenuFlyoutItemsFromModel(overflowShellMenuItems)!;
 			var mainItems = ContextFlyoutModelToElementHelper.GetAppBarButtonsFromModelIgnorePrimary(mainShellMenuItems);
 
 			var openedPopups = Microsoft.UI.Xaml.Media.VisualTreeHelper.GetOpenPopups(MainWindow.Instance);
@@ -989,7 +1058,7 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
 
 			var mainSubMenuTasks = mainItemsWithSubMenu.Select(async item =>
 			{
-				await item.LoadSubMenuAction();
+				await item.LoadSubMenuAction!();
 				ShellContextFlyoutFactory.AddItemsToMainMenu(mainItems, item);
 			});
 
@@ -998,7 +1067,7 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
 
 			var overflowSubMenuTasks = overflowItemsWithSubMenu.Select(async item =>
 			{
-				await item.LoadSubMenuAction();
+				await item.LoadSubMenuAction!();
 				ShellContextFlyoutFactory.AddItemsToOverflowMenu(overflowItem, item);
 			});
 
@@ -1011,8 +1080,9 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
 				// Close main menu when clicking on subitems (#5508)
 				if ((item as AppBarButton)?.Flyout as MenuFlyout is MenuFlyout flyout)
 				{
-					Action<IList<MenuFlyoutItemBase>> clickAction = null!;
-					clickAction = (items) =>
+					AddClickHandlers(flyout.Items);
+
+					void AddClickHandlers(IList<MenuFlyoutItemBase> items)
 					{
 						items.OfType<MenuFlyoutItem>().ForEach(i =>
 						{
@@ -1020,11 +1090,9 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
 						});
 						items.OfType<MenuFlyoutSubItem>().ForEach(i =>
 						{
-							clickAction(i.Items);
+							AddClickHandlers(i.Items);
 						});
-					};
-
-					clickAction(flyout.Items);
+					}
 				}
 			});
 
@@ -1044,7 +1112,9 @@ private void RemoveOverflow(CommandBarFlyout contextMenuFlyout)
 
 		protected virtual void Page_CharacterReceived(UIElement sender, CharacterReceivedRoutedEventArgs args)
 		{
-			if (ParentShellPageInstance!.IsCurrentInstance)
+			var parentShellPage = ParentShellPageInstance
+				?? throw new InvalidOperationException("The layout does not have a parent shell page.");
+			if (parentShellPage.IsCurrentInstance)
 			{
 				char letter = args.Character;
 				JumpString += letter.ToString().ToLowerInvariant();
@@ -1055,21 +1125,33 @@ protected virtual void FileList_DragItemsStarting(object sender, DragItemsStarti
 		{
 			try
 			{
+				if (FolderSettings is not { } folderSettings ||
+					InstanceViewModel is not { } instanceViewModel)
+				{
+					e.Cancel = true;
+					return;
+				}
+
 				var itemList = e.Items.OfType<ListedItem>().ToList();
 				var firstItem = itemList.FirstOrDefault();
-				var sortedItems = SortingHelper.OrderFileList(itemList, FolderSettings.DirectorySortOption, FolderSettings.DirectorySortDirection, FolderSettings.SortDirectoriesAlongsideFiles, FolderSettings.SortFilesFirst).ToList();
+				var sortedItems = SortingHelper.OrderFileList(itemList, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles, folderSettings.SortFilesFirst).ToList();
 				var orderedItems = sortedItems.SkipWhile(x => x != firstItem).Concat(sortedItems.TakeWhile(x => x != firstItem)).ToList();
 
-				var shellItemList = SafetyExtensions.IgnoreExceptions(() => orderedItems.Select(x => new VanaraWindowsShell.ShellItem(x.ItemPath)).ToArray());
-				if (shellItemList?[0].FileSystemPath is not null && !InstanceViewModel.IsPageTypeSearchResults)
+				var shellItemList = SafetyExtensions.IgnoreExceptions(() => orderedItems.Select(item => new VanaraWindowsShell.ShellItem(
+					item.GetRequiredPath())).ToArray());
+				if (shellItemList?[0].FileSystemPath is not null &&
+					!instanceViewModel.IsPageTypeSearchResults)
 				{
-					var iddo = shellItemList[0].Parent.GetChildrenUIObjects<IDataObject>(HWND.NULL, shellItemList);
+					var parentShellItem = shellItemList[0].Parent
+						?? throw new InvalidOperationException("The dragged shell item does not have a parent.");
+					var iddo = parentShellItem.GetChildrenUIObjects<IDataObject>(HWND.NULL, shellItemList);
 					shellItemList.ForEach(x => x.Dispose());
 
 					var format = System.Windows.Forms.DataFormats.GetFormat("Shell IDList Array");
 					if (iddo.TryGetData<byte[]>((uint)format.Id, out var data))
 					{
-						var mem = new MemoryStream(data).AsRandomAccessStream();
+						var mem = new MemoryStream(data
+							?? throw new InvalidOperationException("The shell drag data is empty.")).AsRandomAccessStream();
 						e.Data.SetData(format.Name, mem);
 					}
 				}
@@ -1159,7 +1241,7 @@ private async void Item_DragOver(object sender, DragEventArgs e)
 							e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
 						}
 						else if (draggedItems.Any(x => x.Item is ZipStorageFile || x.Item is ZipStorageFolder)
-							|| ZipStorageFolder.IsZipPath(item.ItemPath))
+							|| ZipStorageFolder.IsZipPath(item.ItemPath!))
 						{
 							e.DragUIOverride.Caption = string.Format(Strings.CopyToFolderCaptionText.GetLocalizedResource(), item.Name);
 							e.AcceptedOperation = DataPackageOperation.Copy;
@@ -1225,7 +1307,13 @@ protected virtual async void Item_Drop(object sender, DragEventArgs e)
 			dragOverItem = null;
 			var item = GetItemFromElement(sender);
 			if (item is not null)
-				await ParentShellPageInstance!.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, (item as IShortcutItem)?.TargetPath ?? item.ItemPath, false, true, item.IsExecutable, item.IsScriptFile);
+			{
+				var parentShellPage = ParentShellPageInstance
+					?? throw new InvalidOperationException("The layout page does not have a parent shell page.");
+				var targetPath = (item as IShortcutItem)?.TargetPath;
+				var destination = !string.IsNullOrEmpty(targetPath) ? targetPath : item.GetRequiredPath();
+				await parentShellPage.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, destination, false, true, item.IsExecutable, item.IsScriptFile);
+			}
 
 			deferral.Complete();
 		}
@@ -1274,7 +1362,8 @@ private void RefreshItem(SelectorItem container, object item, bool inRecycleQueu
 			if (inRecycleQueue)
 			{
 				UpdateItemToolTip(container, null);
-				ParentShellPageInstance!.ShellViewModel.CancelExtendedPropertiesLoadingForItem(listedItem);
+				var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+				shellViewModel.CancelExtendedPropertiesLoadingForItem(listedItem);
 			}
 			else
 			{
@@ -1289,9 +1378,11 @@ private void RefreshItem(SelectorItem container, object item, bool inRecycleQueu
 					uint callbackPhase = 3;
 					args.RegisterUpdateCallback(callbackPhase, async (s, c) =>
 					{
-						await ParentShellPageInstance!.ShellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
-						if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None && listedItem is IGitItem gitItem)
-							await ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
+						var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+
+						await shellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
+						if (shellViewModel.EnabledGitProperties is not GitProperties.None && listedItem is IGitItem gitItem)
+							await shellViewModel.LoadGitPropertiesAsync(gitItem);
 					});
 				}
 			}
@@ -1493,15 +1584,16 @@ protected virtual void ItemsLayout_Drop(object sender, DragEventArgs e)
 
 		private void UpdateCollectionViewSource()
 		{
-			if (ParentShellPageInstance is null)
+			if (ParentShellPageInstance is not { } parentShellPage)
 				return;
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
 
-			if (ParentShellPageInstance.ShellViewModel.FilesAndFolders.IsGrouped)
+			if (shellViewModel.FilesAndFolders.IsGrouped)
 			{
 				var newSource = new CollectionViewSource()
 				{
 					IsSourceGrouped = true,
-					Source = ParentShellPageInstance.ShellViewModel.FilesAndFolders.GroupedCollection
+					Source = shellViewModel.FilesAndFolders.GroupedCollection
 				};
 				CollectionViewSource = newSource;
 			}
@@ -1512,7 +1604,7 @@ private void UpdateCollectionViewSource()
 				var newSource = new CollectionViewSource()
 				{
 					IsSourceGrouped = false,
-					Source = ParentShellPageInstance.ShellViewModel.FilesAndFolders
+					Source = shellViewModel.FilesAndFolders
 				};
 				CollectionViewSource = newSource;
 			}
@@ -1579,7 +1671,7 @@ virtual public void StartRenameItem()
 		{
 		}
 
-		public void CheckRenameDoubleClick(object clickedItem)
+		public void CheckRenameDoubleClick(object? clickedItem)
 		{
 			if (clickedItem is ListedItem item)
 			{
diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml
index d34efd44a742..381dda600284 100644
--- a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml
+++ b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml
@@ -266,7 +266,7 @@
 										x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
 
 									<Image
-										x:Name="IconOverlay"
+										x:Name="IconOverlayElement"
 										Width="16"
 										Height="16"
 										Margin="2"
diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs
index 223f04aa11f1..59b067394add 100644
--- a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs
+++ b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs
@@ -102,7 +102,7 @@ private static void SetRowStyle(ListViewItem? lvi, Style? style)
 
 		// Methods
 
-		private void OnItemLoadStatusChanged(object sender, ItemLoadStatusChangedEventArgs args)
+		private void OnItemLoadStatusChanged(object? sender, ItemLoadStatusChangedEventArgs args)
 		{
 			if (args.Status is ItemLoadStatusChangedEventArgs.ItemLoadStatus.Complete)
 			{
@@ -115,7 +115,8 @@ private void OnItemLoadStatusChanged(object sender, ItemLoadStatusChangedEventAr
 		private void FileList_Loaded(object sender, RoutedEventArgs e)
 		{
 			ContentScroller = FileList.FindDescendant<ScrollViewer>(x => x.Name == "ScrollViewer");
-			ParentShellPageInstance.ShellViewModel.ItemLoadStatusChanged += OnItemLoadStatusChanged;
+			var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+			shellViewModel.ItemLoadStatusChanged += OnItemLoadStatusChanged;
 		}
 
 		private void ColumnViewBase_GotFocus(object sender, RoutedEventArgs e)
@@ -196,11 +197,14 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 		private void HighlightPathDirectory(ListViewBase sender, ContainerContentChangingEventArgs args)
 		{
-			if (args.Item is ListedItem item && columnsOwner?.OwnerPath is string ownerPath
-				&& (ownerPath == item.ItemPath || (ownerPath.Length > item.ItemPath.Length && ownerPath.StartsWith(item.ItemPath) && ownerPath[item.ItemPath.Length] is '/' or '\\')))
+			if (args.Item is ListedItem item && columnsOwner?.OwnerPath is string ownerPath)
 			{
-				SetOpenedFolder(FileList.ContainerFromItem(item) as ListViewItem);
-				FileList.ContainerContentChanging -= HighlightPathDirectory;
+				var itemPath = item.ItemPath!;
+				if (ownerPath == itemPath || (ownerPath.Length > itemPath.Length && ownerPath.StartsWith(itemPath) && ownerPath[itemPath.Length] is '/' or '\\'))
+				{
+					SetOpenedFolder(FileList.ContainerFromItem(item) as ListViewItem);
+					FileList.ContainerContentChanging -= HighlightPathDirectory;
+				}
 			}
 		}
 
@@ -208,7 +212,8 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 		{
 			base.OnNavigatingFrom(e);
 			UserSettingsService.LayoutSettingsService.PropertyChanged -= LayoutSettingsService_PropertyChanged;
-			ParentShellPageInstance.ShellViewModel.ItemLoadStatusChanged -= OnItemLoadStatusChanged;
+			var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+			shellViewModel.ItemLoadStatusChanged -= OnItemLoadStatusChanged;
 		}
 
 		private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -239,16 +244,17 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 
 		private async Task ReloadItemIconsAsync()
 		{
-			if (ParentShellPageInstance is null)
+			if (ParentShellPageInstance is not { } parentShellPage)
 				return;
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
 
-			ParentShellPageInstance.ShellViewModel.CancelExtendedPropertiesLoading();
-			var filesAndFolders = ParentShellPageInstance.ShellViewModel.FilesAndFolders.ToList();
+			shellViewModel.CancelExtendedPropertiesLoading();
+			var filesAndFolders = shellViewModel.FilesAndFolders.ToList();
 			foreach (ListedItem listedItem in filesAndFolders)
 			{
 				listedItem.ItemPropertiesInitialized = false;
 				if (FileList.ContainerFromItem(listedItem) is not null)
-					await ParentShellPageInstance.ShellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
+					await shellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
 			}
 		}
 
@@ -346,7 +352,8 @@ protected override void OnSelectionChanged(SelectionChangedEventArgs e)
 			else if (SelectedItems?.Count > 1
 				|| SelectedItem?.PrimaryItemAttribute is StorageItemTypes.File
 				|| openedFolderPresenter != null && ParentShellPageInstance != null
-				&& !ParentShellPageInstance.ShellViewModel.FilesAndFolders.ToList().Contains(FileList.ItemFromContainer(openedFolderPresenter))
+				&& !ParentShellPageInstance.GetRequiredShellViewModel()
+					.FilesAndFolders.ToList().Contains(FileList.ItemFromContainer(openedFolderPresenter))
 				&& !isDraggingSelectionRectangle) // Skip closing if dragging since nothing should be open
 			{
 				CloseFolder();
@@ -369,7 +376,7 @@ private void TryOpenSelectedFolder()
 			// 7-zip stream is still writing, and navigating into it triggers "Drive Unplugged"
 			// (#13695). StorageArchiveService raises CompressionCompleted on success, which we
 			// handle below to retry the open if the archive is still selected.
-			if (SelectedItem.IsArchive && storageArchiveService.IsCompressionInProgress(SelectedItem.ItemPath))
+			if (SelectedItem.IsArchive && storageArchiveService.IsCompressionInProgress(SelectedItem.ItemPath!))
 				return;
 
 			if (openedFolderPresenter == FileList.ContainerFromItem(SelectedItem))
@@ -385,7 +392,7 @@ private void TryOpenSelectedFolder()
 
 			// Open the selected folder if selected through tap
 			if (UserSettingsService.FoldersSettingsService.OpenFoldersInColumnsViewWithSingleClick.ShouldOpenWithSingleClick(lastPointerDeviceType))
-				ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (SelectedItem is IShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
+				ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = SelectedItem is IShortcutItem { TargetPath.Length: > 0 } shortcut ? shortcut.TargetPath : SelectedItem.ItemPath, ListView = FileList }, EventArgs.Empty);
 			else
 				CloseFolder();
 		}
@@ -410,7 +417,9 @@ private void StorageArchiveService_CompressionCompleted(object? sender, string a
 
 		private void CloseFolder()
 		{
-			var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage) ? associatedColumnShellPage.ColumnParams.Column : 0;
+			var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage)
+				? associatedColumnShellPage.ColumnParams!.Column
+				: 0;
 			this.FindAscendant<ColumnsLayoutPage>()?.DismissOtherBlades(currentBladeIndex);
 			ClearOpenedFolderSelectionIndicator();
 		}
@@ -458,7 +467,7 @@ ParentShellPageInstance is null ||
 				e.Handled = true;
 
 				if (IsItemSelected && SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder)
-					ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (SelectedItem is IShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
+					ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = SelectedItem is IShortcutItem { TargetPath.Length: > 0 } shortcut ? shortcut.TargetPath : SelectedItem.ItemPath, ListView = FileList }, EventArgs.Empty);
 			}
 			else if (e.Key == VirtualKey.Enter && e.KeyStatus.IsMenuKeyDown)
 			{
@@ -492,7 +501,9 @@ ParentShellPageInstance is null ||
 			}
 			else if (e.Key == VirtualKey.Left) // Left arrow: select parent folder (previous column)
 			{
-				var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage) ? associatedColumnShellPage.ColumnParams.Column : 0;
+				var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage)
+					? associatedColumnShellPage.ColumnParams!.Column
+					: 0;
 				this.FindAscendant<ColumnsLayoutPage>()?.MoveFocusToPreviousBlade(currentBladeIndex);
 				FileList.SelectedItem = null;
 				ClearOpenedFolderSelectionIndicator();
@@ -500,7 +511,9 @@ ParentShellPageInstance is null ||
 			}
 			else if (e.Key == VirtualKey.Right) // Right arrow: switch focus to next column
 			{
-				var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage) ? associatedColumnShellPage.ColumnParams.Column : 0;
+				var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage)
+					? associatedColumnShellPage.ColumnParams!.Column
+					: 0;
 				this.FindAscendant<ColumnsLayoutPage>()?.MoveFocusToNextBlade(currentBladeIndex + 1);
 				e.Handled = true;
 			}
@@ -522,7 +535,7 @@ private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventA
 						break;
 					case StorageItemTypes.Folder:
 						if (!UserSettingsService.FoldersSettingsService.OpenFoldersInColumnsViewWithSingleClick.ShouldOpenWithSingleClick(e.PointerDeviceType))
-							ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (item is IShortcutItem sht ? sht.TargetPath : item.ItemPath), ListView = FileList }, EventArgs.Empty);
+							ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = item is IShortcutItem { TargetPath.Length: > 0 } shortcut ? shortcut.TargetPath : item.ItemPath, ListView = FileList }, EventArgs.Empty);
 						break;
 					default:
 						if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
@@ -583,7 +596,7 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 				// SelectionChanged won't fire if the folder is already selected (e.g. from a prior right-click),
 				// so drive the single-click open from here too (#18584).
 				ResetRenameDoubleClick();
-				ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (item is IShortcutItem sht ? sht.TargetPath : item!.ItemPath), ListView = FileList }, EventArgs.Empty);
+				ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = item is IShortcutItem { TargetPath.Length: > 0 } shortcut ? shortcut.TargetPath : item!.ItemPath, ListView = FileList }, EventArgs.Empty);
 			}
 			else if (item is not null)
 			{
@@ -621,9 +634,10 @@ private void CheckDoubleClick(ListedItem item)
 			{
 				ClearOpenedFolderSelectionIndicator();
 
-				var itemPath = item!.ItemPath.EndsWith('\\')
-					? item.ItemPath.Substring(0, item.ItemPath.Length - 1)
-					: item.ItemPath;
+				var fullItemPath = item.ItemPath!;
+				var itemPath = fullItemPath.EndsWith('\\')
+					? fullItemPath.Substring(0, fullItemPath.Length - 1)
+					: fullItemPath;
 
 				ItemTapped?.Invoke(new ColumnParam { Source = this, NavPathParam = Path.GetDirectoryName(itemPath), ListView = FileList }, EventArgs.Empty);
 
@@ -677,7 +691,7 @@ protected override void SelectionRectangle_SelectionEnded(object? sender, EventA
 			if (SelectedItems?.Count is 1
 				&& SelectedItem is not null
 				&& SelectedItem.PrimaryItemAttribute is StorageItemTypes.Folder)
-				ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (SelectedItem is IShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
+				ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = SelectedItem is IShortcutItem { TargetPath.Length: > 0 } shortcut ? shortcut.TargetPath : SelectedItem.ItemPath, ListView = FileList }, EventArgs.Empty);
 
 			base.SelectionRectangle_SelectionEnded(sender, e);
 		}
diff --git a/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
index 9cdc5a9f813f..f9a6e80a4d16 100644
--- a/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
+++ b/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
@@ -58,16 +58,18 @@ protected override bool CanGetItemFromElement(object element)
 		private void ColumnViewBase_ItemInvoked(object? sender, EventArgs e)
 		{
 			var column = sender as ColumnParam;
-			if (column?.ListView.FindAscendant<ColumnsLayoutPage>() != this)
+			if (column?.ListView!.FindAscendant<ColumnsLayoutPage>() != this)
 				return;
 
-			var nextBladeIndex = ColumnHost.ActiveBlades.IndexOf(column.ListView.FindAscendant<BladeItem>()) + 1;
+			var listView = column.ListView!;
+			var currentBlade = listView.FindAscendant<BladeItem>();
+			var nextBladeIndex = ColumnHost.ActiveBlades.IndexOf(currentBlade!) + 1;
 			var nextBlade = ColumnHost.ActiveBlades.ToList().ElementAtOrDefault(nextBladeIndex);
 			var arePathsDifferent = ((nextBlade?.Content as Frame)?.Content as IShellPage)?.ShellViewModel?.WorkingDirectory != column.NavPathParam;
 
 			if (nextBlade is null || arePathsDifferent)
 			{
-				DismissOtherBlades(column.ListView);
+				DismissOtherBlades(listView);
 
 				var (frame, newblade) = CreateAndAddNewBlade();
 
@@ -76,8 +78,12 @@ private void ColumnViewBase_ItemInvoked(object? sender, EventArgs e)
 					Column = ColumnHost.ActiveBlades.IndexOf(newblade),
 					NavPathParam = column.NavPathParam
 				});
-				navigationArguments.NavPathParam = column.NavPathParam;
-				ParentShellPageInstance.TabBarItemParameter.NavigationParameter = column.NavPathParam;
+				var args = navigationArguments
+					?? throw new InvalidOperationException("The column navigation arguments are not available.");
+				args.NavPathParam = column.NavPathParam;
+				var tabArguments = ParentShellPageInstance?.TabBarItemParameter
+					?? throw new InvalidOperationException("The parent tab navigation arguments are not available.");
+				tabArguments.NavigationParameter = column.NavPathParam;
 			}
 		}
 
@@ -93,16 +99,27 @@ public void SetWidth(int index)
 			ColumnHost.ScrollToEnd();
 		}
 
-		private void ContentChanged(IShellPage p)
+		private void ContentChanged(IShellPage? shellPage)
 		{
-			(ParentShellPageInstance as ModernShellPage)?.RaiseContentChanged(p, p.TabBarItemParameter);
+			if (ParentShellPageInstance is ModernShellPage parent)
+			{
+				if (shellPage is null)
+					throw new InvalidOperationException("The active column shell page is not available.");
+
+				var tabArguments = shellPage.TabBarItemParameter
+					?? throw new InvalidOperationException("The column tab navigation arguments are not available.");
+				parent.RaiseContentChanged(shellPage, tabArguments);
+			}
 		}
 
 		protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 		{
 			base.OnNavigatedTo(eventArgs);
 
-			var path = navigationArguments.NavPathParam;
+			var args = navigationArguments
+				?? throw new InvalidOperationException("The column navigation arguments are not available.");
+			var path = args.NavPathParam
+				?? throw new InvalidOperationException("The column navigation path is not available.");
 			var pathRoot = GetPathRoot(path);
 			var pathStack = new Stack<string>();
 
@@ -120,18 +137,18 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 				}
 			}
 
-			OwnerPath = navigationArguments.NavPathParam;
+			OwnerPath = args.NavPathParam;
 			FocusIndex = pathStack.Count;
 
 			MainPageFrame.Navigated += Frame_Navigated;
 			MainPageFrame.Navigate(typeof(ColumnShellPage), new ColumnParam
 			{
 				Column = 0,
-				IsSearchResultPage = navigationArguments.IsSearchResultPage,
-				SearchQuery = navigationArguments.SearchQuery,
-				SearchPathParam = navigationArguments.SearchPathParam,
+				IsSearchResultPage = args.IsSearchResultPage,
+				SearchQuery = args.SearchQuery,
+				SearchPathParam = args.SearchPathParam,
 				NavPathParam = path,
-				SelectItems = path == navigationArguments.NavPathParam ? navigationArguments.SelectItems : null
+				SelectItems = path == args.NavPathParam ? args.SelectItems : null
 			});
 
 			var index = 0;
@@ -140,17 +157,19 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 				var (frame, _) = CreateAndAddNewBlade();
 
 				frame.Navigate(typeof(ColumnShellPage), new ColumnParam
-				{
-					Column = ++index,
-					NavPathParam = path,
-					SelectItems = path == navigationArguments.NavPathParam ? navigationArguments.SelectItems : null
-				});
+					{
+						Column = ++index,
+						NavPathParam = path,
+						SelectItems = path == args.NavPathParam ? args.SelectItems : null
+					});
 			}
 		}
 
 		protected override void InitializeCommandsViewModel()
 		{
-			CommandsViewModel = new BaseLayoutViewModel(ParentShellPageInstance, ItemManipulationModel);
+			var parentShellPage = ParentShellPageInstance
+				?? throw new InvalidOperationException("The parent shell page must be initialized before commands.");
+			CommandsViewModel = new BaseLayoutViewModel(parentShellPage, ItemManipulationModel);
 		}
 
 		protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -196,9 +215,9 @@ private void DismissOtherBlades(ListView listView)
 			DismissOtherBlades(listView.FindAscendant<BladeItem>());
 		}
 
-		private void DismissOtherBlades(BladeItem blade)
+		private void DismissOtherBlades(BladeItem? blade)
 		{
-			DismissOtherBlades(ColumnHost.ActiveBlades.IndexOf(blade));
+			DismissOtherBlades(ColumnHost.ActiveBlades.IndexOf(blade!));
 		}
 
 		public void DismissOtherBlades(int index)
@@ -219,8 +238,14 @@ public void DismissOtherBlades(int index)
 							columnLayout.KeyUp -= ColumnViewBase_KeyUp;
 						}
 
-						(frame?.Content as UIElement).GotFocus -= ColumnViewBrowser_GotFocus;
-						(frame?.Content as ColumnShellPage).ContentChanged -= ColumnViewBrowser_ContentChanged;
+						var content = frame?.Content
+							?? throw new InvalidOperationException("The column blade does not contain a page.");
+						(content as UIElement
+							?? throw new InvalidOperationException("The column page is not a UI element."))
+							.GotFocus -= ColumnViewBrowser_GotFocus;
+						(content as ColumnShellPage
+							?? throw new InvalidOperationException("The column blade does not contain a shell page."))
+							.ContentChanged -= ColumnViewBrowser_ContentChanged;
 
 						// Dispose content AFTER unsubscribing event handlers
 						if (frame?.Content is IDisposable disposableContent)
@@ -230,10 +255,15 @@ public void DismissOtherBlades(int index)
 						ColumnHost.ActiveBlades.RemoveAt(index + 1);
 					}
 
-					if ((ColumnHost.ActiveBlades[index].Content as Frame)?.Content is ColumnShellPage s)
+					if ((ColumnHost.ActiveBlades[index].Content as Frame)?.Content is ColumnShellPage shellPage)
 					{
-						navigationArguments.NavPathParam = s.ShellViewModel.WorkingDirectory;
-						ParentShellPageInstance.TabBarItemParameter.NavigationParameter = s.ShellViewModel.WorkingDirectory;
+						var shellViewModel = shellPage.GetRequiredShellViewModel();
+						var args = navigationArguments
+							?? throw new InvalidOperationException("The column navigation arguments are not available.");
+						args.NavPathParam = shellViewModel.WorkingDirectory;
+						var tabArguments = ParentShellPageInstance?.TabBarItemParameter
+							?? throw new InvalidOperationException("The parent tab navigation arguments are not available.");
+						tabArguments.NavigationParameter = shellViewModel.WorkingDirectory;
 					}
 				});
 			}
@@ -243,10 +273,16 @@ public void DismissOtherBlades(int index)
 
 		private void Frame_Navigated(object sender, NavigationEventArgs e)
 		{
-			var f = sender as Frame;
-			f.Navigated -= Frame_Navigated;
-			(f.Content as IShellPage).ContentChanged += ColumnViewBrowser_ContentChanged;
-			(f.Content as UIElement).GotFocus += ColumnViewBrowser_GotFocus;
+			if (sender is not Frame frame)
+				return;
+
+			frame.Navigated -= Frame_Navigated;
+			(frame.Content as IShellPage
+				?? throw new InvalidOperationException("The column frame does not contain a shell page."))
+				.ContentChanged += ColumnViewBrowser_ContentChanged;
+			(frame.Content as UIElement
+				?? throw new InvalidOperationException("The column frame content is not a UI element."))
+				.GotFocus += ColumnViewBrowser_GotFocus;
 		}
 
 		private void ColumnViewBrowser_GotFocus(object sender, RoutedEventArgs e)
@@ -261,7 +297,9 @@ private void ColumnViewBrowser_GotFocus(object sender, RoutedEventArgs e)
 				ColumnHost.ActiveBlades.ToList().ForEach(x =>
 				{
 					var shellPage = (x.Content as Frame)?.Content as ColumnShellPage;
-					shellPage.IsCurrentInstance = false;
+					(shellPage
+						?? throw new InvalidOperationException("A column blade does not contain a shell page."))
+						.IsCurrentInstance = false;
 				});
 			}
 
@@ -269,7 +307,7 @@ private void ColumnViewBrowser_GotFocus(object sender, RoutedEventArgs e)
 			ContentChanged(shPage);
 		}
 
-		private void ColumnViewBrowser_ContentChanged(object sender, TabBarItemParameter e)
+		private void ColumnViewBrowser_ContentChanged(object? sender, TabBarItemParameter e)
 		{
 			var c = sender as IShellPage;
 			var columnView = c?.SlimContentPage as ColumnLayoutPage;
@@ -290,7 +328,8 @@ private void ColumnViewBase_KeyUp(object sender, Microsoft.UI.Xaml.Input.KeyRout
 		{
 			var shPage = ActiveColumnShellPage as ColumnShellPage;
 			if (shPage?.SlimContentPage?.SelectedItem?.PrimaryItemAttribute is not StorageItemTypes.Folder)
-				CloseUnnecessaryColumns(shPage?.ColumnParams);
+				CloseUnnecessaryColumns(shPage?.ColumnParams
+					?? throw new InvalidOperationException("The active column does not have navigation parameters."));
 		}
 
 		public void NavigateBack()
@@ -309,7 +348,7 @@ public void NavigateUp()
 				DismissOtherBlades(ColumnHost.ActiveBlades[ColumnHost.ActiveBlades.Count - 2]);
 			else
 			{
-				var workingDirectory = ((ColumnHost.ActiveBlades?.ToList().FirstOrDefault()?.Content as Frame)?.Content as ColumnShellPage)?.ShellViewModel.WorkingDirectory;
+				var workingDirectory = ((ColumnHost.ActiveBlades?.ToList().FirstOrDefault()?.Content as Frame)?.Content as ColumnShellPage)?.ShellViewModel?.WorkingDirectory;
 				if (workingDirectory is null || string.Equals(workingDirectory, GetPathRoot(workingDirectory), StringComparison.OrdinalIgnoreCase))
 					ParentShellPageInstance?.NavigateHome();
 				else
@@ -383,7 +422,7 @@ public void MoveFocusToNextBlade(int currentBladeIndex)
 			return activeBladePage.SlimContentPage as ColumnLayoutPage;
 		}
 
-		public void SetSelectedPathOrNavigate(string navigationPath, Type sourcePageType, NavigationArguments navArgs = null)
+		public void SetSelectedPathOrNavigate(string navigationPath, Type? sourcePageType, NavigationArguments? navArgs = null)
 		{
 			if (navArgs is not null && navArgs.IsSearchResultPage)
 			{
@@ -393,8 +432,8 @@ public void SetSelectedPathOrNavigate(string navigationPath, Type sourcePageType
 			}
 
 			var destPath = navArgs is not null ? navArgs.NavPathParam : navigationPath;
-			var columnPath = ((ColumnHost.ActiveBlades.ToList().LastOrDefault()?.Content as Frame)?.Content as ColumnShellPage)?.ShellViewModel.WorkingDirectory;
-			var columnFirstPath = ((ColumnHost.ActiveBlades.ToList().FirstOrDefault()?.Content as Frame)?.Content as ColumnShellPage)?.ShellViewModel.WorkingDirectory;
+			var columnPath = ((ColumnHost.ActiveBlades.ToList().LastOrDefault()?.Content as Frame)?.Content as ColumnShellPage)?.ShellViewModel?.WorkingDirectory;
+			var columnFirstPath = ((ColumnHost.ActiveBlades.ToList().FirstOrDefault()?.Content as Frame)?.Content as ColumnShellPage)?.ShellViewModel?.WorkingDirectory;
 
 			if (string.IsNullOrEmpty(destPath) || string.IsNullOrEmpty(columnPath) || string.IsNullOrEmpty(columnFirstPath))
 			{
@@ -436,12 +475,15 @@ public void SetSelectedPathOrNavigate(string navigationPath, Type sourcePageType
 
 		public void SetSelectedPathOrNavigate(PathNavigationEventArgs e)
 		{
+			var itemPath = e.ItemPath
+				?? throw new InvalidOperationException("The navigation event does not contain a path.");
+
 			if (ColumnHost.ActiveBlades?.Count > 1)
 			{
 				foreach (var item in ColumnHost.ActiveBlades.ToList())
 				{
-					if ((item.Content as Frame)?.Content is ColumnShellPage s &&
-						NormalizePath(s.ShellViewModel?.WorkingDirectory) == NormalizePath(e.ItemPath))
+					if ((item.Content as Frame)?.Content is ColumnShellPage { ShellViewModel.WorkingDirectory: { } workingDirectory } &&
+						NormalizePath(workingDirectory) == NormalizePath(itemPath))
 					{
 						DismissOtherBlades(item);
 						return;
@@ -452,20 +494,21 @@ public void SetSelectedPathOrNavigate(PathNavigationEventArgs e)
 			if (ParentShellPageInstance is null)
 				return;
 
-			if (NormalizePath(ParentShellPageInstance.ShellViewModel?.WorkingDirectory) != NormalizePath(e.ItemPath))
-				ParentShellPageInstance.NavigateToPath(e.ItemPath);
+			if (NormalizePath(ParentShellPageInstance.ShellViewModel?.WorkingDirectory) != NormalizePath(itemPath))
+				ParentShellPageInstance.NavigateToPath(itemPath);
 			else
 				DismissOtherBlades(0);
 		}
 
-		public IShellPage ActiveColumnShellPage
+		public IShellPage? ActiveColumnShellPage
 		{
 			get
 			{
 				if (ColumnHost.ActiveBlades?.Count > 0)
 				{
-					var shellPages = ColumnHost.ActiveBlades.ToList().Select(x => (x.Content as Frame).Content as IShellPage);
-					var activeInstance = shellPages.SingleOrDefault(x => x.IsCurrentInstance);
+					var shellPages = ColumnHost.ActiveBlades.ToList()
+						.Select(x => (x.Content as Frame)!.Content as IShellPage);
+					var activeInstance = shellPages.SingleOrDefault(x => x!.IsCurrentInstance);
 					return activeInstance ?? shellPages.Last();
 				}
 
@@ -476,7 +519,8 @@ public IShellPage ActiveColumnShellPage
 		private void ColumnViewBase_ItemTapped(object? sender, EventArgs e)
 		{
 			var column = sender as ColumnParam;
-			if (column?.ListView.FindAscendant<ColumnsLayoutPage>() != this || string.IsNullOrEmpty(column.NavPathParam))
+			if (column?.ListView!.FindAscendant<ColumnsLayoutPage>() != this ||
+				string.IsNullOrEmpty(column.NavPathParam))
 				return;
 
 			CloseUnnecessaryColumns(column);
diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
index f9f4981bf964..edba33a25ecc 100644
--- a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
+++ b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
@@ -971,7 +971,7 @@
 												x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
 
 											<Image
-												x:Name="IconOverlay"
+												x:Name="IconOverlayElement"
 												Width="16"
 												Height="16"
 												Margin="2"
@@ -1196,7 +1196,7 @@
 
 									<!--  Item Path  -->
 									<TextBlock
-										x:Name="ItemPath"
+										x:Name="ItemPathTextBlock"
 										Width="{Binding ColumnsViewModel.PathColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
 										Padding="10,0,0,0"
 										HorizontalAlignment="Stretch"
@@ -1237,7 +1237,7 @@
 
 									<!--  Item Modified Date  -->
 									<TextBlock
-										x:Name="ItemDateModified"
+										x:Name="ItemDateModifiedTextBlock"
 										Width="{Binding ColumnsViewModel.DateModifiedColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
 										Padding="10,0,0,0"
 										HorizontalAlignment="Stretch"
@@ -1250,7 +1250,7 @@
 
 									<!--  Item Created Date  -->
 									<TextBlock
-										x:Name="ItemDateCreated"
+										x:Name="ItemDateCreatedTextBlock"
 										Width="{Binding ColumnsViewModel.DateCreatedColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
 										Padding="10,0,0,0"
 										HorizontalAlignment="Stretch"
@@ -1263,7 +1263,7 @@
 
 									<!--  Item Type  -->
 									<TextBlock
-										x:Name="ItemType"
+										x:Name="ItemTypeTextBlock"
 										Width="{Binding ColumnsViewModel.ItemTypeColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
 										Padding="10,0,0,0"
 										HorizontalAlignment="Stretch"
diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
index 2c136d4e4c27..0da8ba18c6aa 100644
--- a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
+++ b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
@@ -89,14 +89,16 @@ public DetailsLayoutPage() : base()
 			{
 				if (!Enum.TryParse<SortOption>(x, out var val))
 					return;
-				if (FolderSettings.DirectorySortOption == val)
+				var folderSettings = FolderSettings
+					?? throw new InvalidOperationException("The details layout does not have folder settings.");
+				if (folderSettings.DirectorySortOption == val)
 				{
-					FolderSettings.DirectorySortDirection = (SortDirection)(((int)FolderSettings.DirectorySortDirection + 1) % 2);
+					folderSettings.DirectorySortDirection = (SortDirection)(((int)folderSettings.DirectorySortDirection + 1) % 2);
 				}
 				else
 				{
-					FolderSettings.DirectorySortOption = val;
-					FolderSettings.DirectorySortDirection = SortDirection.Ascending;
+					folderSettings.DirectorySortOption = val;
+					folderSettings.DirectorySortDirection = SortDirection.Ascending;
 				}
 			});
 		}
@@ -148,6 +150,12 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			base.OnNavigatedTo(eventArgs);
 
+			var parentShellPage = ParentShellPageInstance
+				?? throw new InvalidOperationException("The details layout must be associated with a shell page.");
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The details layout requires folder settings.");
+
 			currentIconSize = LayoutSizeKindHelper.GetIconSize(FolderLayoutModes.DetailsView);
 
 			if (FolderSettings?.ColumnsViewModel is not null)
@@ -174,13 +182,13 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 				ColumnsViewModel.GitLastCommitShaColumn.Update(FolderSettings.ColumnsViewModel.GitLastCommitShaColumn);
 			}
 
-			ParentShellPageInstance.ShellViewModel.EnabledGitProperties = GetEnabledGitProperties(ColumnsViewModel);
+			shellViewModel.EnabledGitProperties = GetEnabledGitProperties(ColumnsViewModel);
 
-			FolderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested;
-			FolderSettings.SortDirectionPreferenceUpdated += FolderSettings_SortDirectionPreferenceUpdated;
-			FolderSettings.SortOptionPreferenceUpdated += FolderSettings_SortOptionPreferenceUpdated;
-			ParentShellPageInstance.ShellViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
-			ParentShellPageInstance.ShellViewModel.ItemLoadStatusChanged += ShellViewModel_ItemLoadStatusChanged;
+			folderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested;
+			folderSettings.SortDirectionPreferenceUpdated += FolderSettings_SortDirectionPreferenceUpdated;
+			folderSettings.SortOptionPreferenceUpdated += FolderSettings_SortOptionPreferenceUpdated;
+			shellViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
+			shellViewModel.ItemLoadStatusChanged += ShellViewModel_ItemLoadStatusChanged;
 			UserSettingsService.LayoutSettingsService.PropertyChanged += LayoutSettingsService_PropertyChanged;
 			FileList.Items.VectorChanged += FileListItems_VectorChanged;
 
@@ -204,11 +212,14 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 		protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 		{
 			base.OnNavigatingFrom(e);
-			FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
-			FolderSettings.SortDirectionPreferenceUpdated -= FolderSettings_SortDirectionPreferenceUpdated;
-			FolderSettings.SortOptionPreferenceUpdated -= FolderSettings_SortOptionPreferenceUpdated;
-			ParentShellPageInstance.ShellViewModel.PageTypeUpdated -= FilesystemViewModel_PageTypeUpdated;
-			ParentShellPageInstance.ShellViewModel.ItemLoadStatusChanged -= ShellViewModel_ItemLoadStatusChanged;
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The details layout does not have folder settings.");
+			folderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
+			folderSettings.SortDirectionPreferenceUpdated -= FolderSettings_SortDirectionPreferenceUpdated;
+			folderSettings.SortOptionPreferenceUpdated -= FolderSettings_SortOptionPreferenceUpdated;
+			var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+			shellViewModel.PageTypeUpdated -= FilesystemViewModel_PageTypeUpdated;
+			shellViewModel.ItemLoadStatusChanged -= ShellViewModel_ItemLoadStatusChanged;
 			UserSettingsService.LayoutSettingsService.PropertyChanged -= LayoutSettingsService_PropertyChanged;
 			FileList.Items.VectorChanged -= FileListItems_VectorChanged;
 			_autoFitColumnsTimer?.Stop();
@@ -240,7 +251,7 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 			else
 			{
 				var settings = sender as ILayoutSettingsService;
-				var isDefaultPath = FolderSettings?.IsPathUsingDefaultLayout(ParentShellPageInstance?.ShellViewModel.CurrentFolder?.ItemPath);
+				var isDefaultPath = FolderSettings?.IsPathUsingDefaultLayout(ParentShellPageInstance?.ShellViewModel?.CurrentFolder?.ItemPath);
 				if (settings is not null && (isDefaultPath ?? true))
 				{
 					switch (e.PropertyName)
@@ -315,16 +326,19 @@ private void FolderSettings_SortDirectionPreferenceUpdated(object? sender, SortD
 
 		private void UpdateSortIndicator()
 		{
-			NameHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.Name ? FolderSettings.DirectorySortDirection : null;
-			TagHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.FileTag ? FolderSettings.DirectorySortDirection : null;
-			PathHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.Path ? FolderSettings.DirectorySortDirection : null;
-			OriginalPathHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.OriginalFolder ? FolderSettings.DirectorySortDirection : null;
-			DateDeletedHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.DateDeleted ? FolderSettings.DirectorySortDirection : null;
-			DateModifiedHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.DateModified ? FolderSettings.DirectorySortDirection : null;
-			DateCreatedHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.DateCreated ? FolderSettings.DirectorySortDirection : null;
-			FileTypeHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.FileType ? FolderSettings.DirectorySortDirection : null;
-			ItemSizeHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.Size ? FolderSettings.DirectorySortDirection : null;
-			SyncStatusHeader.ColumnSortOption = FolderSettings.DirectorySortOption == SortOption.SyncStatus ? FolderSettings.DirectorySortDirection : null;
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The details layout does not have folder settings.");
+
+			NameHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.Name ? folderSettings.DirectorySortDirection : null;
+			TagHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.FileTag ? folderSettings.DirectorySortDirection : null;
+			PathHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.Path ? folderSettings.DirectorySortDirection : null;
+			OriginalPathHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.OriginalFolder ? folderSettings.DirectorySortDirection : null;
+			DateDeletedHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.DateDeleted ? folderSettings.DirectorySortDirection : null;
+			DateModifiedHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.DateModified ? folderSettings.DirectorySortDirection : null;
+			DateCreatedHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.DateCreated ? folderSettings.DirectorySortDirection : null;
+			FileTypeHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.FileType ? folderSettings.DirectorySortDirection : null;
+			ItemSizeHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.Size ? folderSettings.DirectorySortDirection : null;
+			SyncStatusHeader.ColumnSortOption = folderSettings.DirectorySortOption == SortOption.SyncStatus ? folderSettings.DirectorySortDirection : null;
 		}
 
 		private void FilesystemViewModel_PageTypeUpdated(object? sender, PageTypeUpdatedEventArgs e)
@@ -576,27 +590,28 @@ protected override bool CanGetItemFromElement(object element)
 
 		private async Task ReloadItemIconsAsync()
 		{
-			if (ParentShellPageInstance is null)
+			if (ParentShellPageInstance is not { } parentShellPage)
 				return;
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
 
-			ParentShellPageInstance.ShellViewModel.CancelExtendedPropertiesLoading();
-			var filesAndFolders = ParentShellPageInstance.ShellViewModel.FilesAndFolders.ToList();
+			shellViewModel.CancelExtendedPropertiesLoading();
+			var filesAndFolders = shellViewModel.FilesAndFolders.ToList();
 
 			await Task.WhenAll(filesAndFolders.Select(listedItem =>
 			{
 				listedItem.ItemPropertiesInitialized = false;
 				if (FileList.ContainerFromItem(listedItem) is not null)
-					return ParentShellPageInstance.ShellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
+					return shellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
 				else
 					return Task.CompletedTask;
 			}));
 
-			if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None)
+			if (shellViewModel.EnabledGitProperties is not GitProperties.None)
 			{
 				await Task.WhenAll(filesAndFolders.Select(item =>
 				{
 					if (item is IGitItem gitItem)
-						return ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
+						return shellViewModel.LoadGitPropertiesAsync(gitItem);
 
 					return Task.CompletedTask;
 				}));
@@ -674,8 +689,11 @@ private async Task OpenItem(ListedItem item)
 			if (!Commands.OpenItem.IsExecutable)
 			{
 				// Fallback if the command is not executable. It occurs only when search is performed from the columns view.
+				if (ParentShellPageInstance is not { } parentShellPage)
+					throw new InvalidOperationException("The details layout does not have a parent shell page.");
+
 				var itemType = item.PrimaryItemAttribute == StorageItemTypes.Folder ? FilesystemItemType.Directory : FilesystemItemType.File;
-				await NavigationHelpers.OpenPath(item.ItemPath, ParentShellPageInstance, itemType);
+				await NavigationHelpers.OpenPath(item.ItemPath!, parentShellPage, itemType);
 			}
 			else
 			{
@@ -731,7 +749,9 @@ private void GridSplitter_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
 			if (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right)
 			{
 				UpdateColumnLayout();
-				FolderSettings.ColumnsViewModel = ColumnsViewModel;
+				var folderSettings = FolderSettings
+					?? throw new InvalidOperationException("The details layout does not have folder settings.");
+				folderSettings.ColumnsViewModel = ColumnsViewModel;
 			}
 		}
 
@@ -770,7 +790,9 @@ private void GridSplitter_ManipulationStarted(object sender, ManipulationStarted
 
 		private void GridSplitter_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
 		{
-			FolderSettings.ColumnsViewModel = ColumnsViewModel;
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The details layout does not have folder settings.");
+			folderSettings.ColumnsViewModel = ColumnsViewModel;
 			this.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow));
 		}
 
@@ -781,8 +803,11 @@ private void GridSplitter_Loaded(object sender, RoutedEventArgs e)
 
 		private void ToggleMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
 		{
-			FolderSettings.ColumnsViewModel = ColumnsViewModel;
-			ParentShellPageInstance.ShellViewModel.EnabledGitProperties = GetEnabledGitProperties(ColumnsViewModel);
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The details layout does not have folder settings.");
+			folderSettings.ColumnsViewModel = ColumnsViewModel;
+			var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+			shellViewModel.EnabledGitProperties = GetEnabledGitProperties(ColumnsViewModel);
 		}
 
 		private void GridSplitter_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
@@ -821,7 +846,7 @@ private void AutoFitColumnsIfEnabled()
 				TimeSpan.FromMilliseconds(250));
 		}
 
-		private void ShellViewModel_ItemLoadStatusChanged(object sender, ItemLoadStatusChangedEventArgs e)
+		private void ShellViewModel_ItemLoadStatusChanged(object? sender, ItemLoadStatusChangedEventArgs e)
 		{
 			if (e.Status == ItemLoadStatusChangedEventArgs.ItemLoadStatus.Complete)
 				AutoFitColumnsIfEnabled();
@@ -899,7 +924,9 @@ private void ResizeColumnToFit(int columnToResize)
 				column.UserLength = new GridLength(maxFitLength, GridUnitType.Pixel);
 			}
 
-			FolderSettings.ColumnsViewModel = ColumnsViewModel;
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The details layout does not have folder settings.");
+			folderSettings.ColumnsViewModel = ColumnsViewModel;
 		}
 
 		private double MeasureColumnEstimate(int columnIndex, int measureItemsCount, int maxItemLength)
@@ -978,12 +1005,12 @@ private bool IsCorrectColumn(FrameworkElement element, int columnIndex)
 				"ItemGitCommitAuthorTextBlock" => 6,
 				"ItemGitLastCommitShaTextBlock" => 7,
 				"ItemTagGrid" => 8,
-				"ItemPath" => 9,
+				"ItemPathTextBlock" => 9,
 				"ItemOriginalPath" => 10,
 				"ItemDateDeleted" => 11,
-				"ItemDateModified" => 12,
-				"ItemDateCreated" => 13,
-				"ItemType" => 14,
+				"ItemDateModifiedTextBlock" => 12,
+				"ItemDateCreatedTextBlock" => 13,
+				"ItemTypeTextBlock" => 14,
 				"ItemSize" => 15,
 				"ItemStatus" => 16,
 				_ => -1,
@@ -999,8 +1026,7 @@ private void FileList_Loaded(object sender, RoutedEventArgs e)
 
 			RootGridZoom.ViewChangeStarted += (_, args) =>
 			{
-				var scroller = ContentScroller;
-				if (args.IsSourceZoomedInView || scroller is null)
+				if (args.IsSourceZoomedInView || ContentScroller is not { } scroller)
 					return;
 				void OnZoomScrolled(object? s, ScrollViewerViewChangedEventArgs ve)
 				{
@@ -1106,12 +1132,17 @@ private async void RemoveTagIcon_Tapped(object sender, TappedRoutedEventArgs e)
 
 			if (tagId is not null)
 			{
-				item.FileTags = item.FileTags
+				var fileTags = item.FileTags
+					?? throw new InvalidOperationException("The selected item does not have initialized tags.");
+				item.FileTags = fileTags
 					.Except([tagId])
 					.ToArray();
 
 				if (ParentShellPageInstance is not null)
-					await ParentShellPageInstance.ShellViewModel.RefreshTagGroups();
+				{
+					var shellViewModel = ParentShellPageInstance.GetRequiredShellViewModel();
+					await shellViewModel.RefreshTagGroups();
+				}
 			}
 
 			e.Handled = true;
@@ -1171,7 +1202,7 @@ private async void ViewSizeButton_Click(object sender, RoutedEventArgs e)
 
 			item.IsCalculatingSize = true;
 			var sizeProvider = Ioc.Default.GetRequiredService<Services.SizeProvider.ISizeProvider>();
-			var updateTask = Task.Run(() => sizeProvider.UpdateAsync(item.ItemPath, default));
+			var updateTask = Task.Run(() => sizeProvider.UpdateAsync(item.ItemPath!, default));
 
 			try
 			{
@@ -1215,4 +1246,4 @@ private static GitProperties GetEnabledGitProperties(ColumnsViewModel columnsVie
 			};
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml b/src/Files.App/Views/Layouts/GridLayoutPage.xaml
index 6c8fd4bc537a..089ce3413793 100644
--- a/src/Files.App/Views/Layouts/GridLayoutPage.xaml
+++ b/src/Files.App/Views/Layouts/GridLayoutPage.xaml
@@ -134,7 +134,7 @@
 							x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
 
 						<Image
-							x:Name="IconOverlay"
+							x:Name="IconOverlayElement"
 							Width="32"
 							Height="32"
 							Margin="16"
@@ -325,7 +325,7 @@
 								x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
 
 							<Image
-								x:Name="IconOverlay"
+								x:Name="IconOverlayElement"
 								Width="16"
 								Height="16"
 								Margin="2"
@@ -472,7 +472,7 @@
 								x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
 
 							<Image
-								x:Name="IconOverlay"
+								x:Name="IconOverlayElement"
 								Width="32"
 								Height="32"
 								Margin="-10"
diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
index f1098b2f54c4..2220fbe9665c 100644
--- a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
+++ b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
@@ -199,16 +199,22 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			base.OnNavigatedTo(eventArgs);
 
-			currentIconSize = LayoutSizeKindHelper.GetIconSize(FolderSettings.LayoutMode);
+			var parentShellPage = ParentShellPageInstance
+				?? throw new InvalidOperationException("The grid layout must be associated with a shell page.");
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The grid layout requires folder settings.");
 
-			FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
-			FolderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested;
+			currentIconSize = LayoutSizeKindHelper.GetIconSize(folderSettings.LayoutMode);
+
+			folderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
+			folderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested;
 			UserSettingsService.LayoutSettingsService.PropertyChanged += LayoutSettingsService_PropertyChanged;
 
 			// Set ItemTemplate
 			SetItemTemplate();
 			SetItemContainerStyle();
-			FileList.ItemsSource ??= ParentShellPageInstance.ShellViewModel.FilesAndFolders;
+			FileList.ItemsSource ??= shellViewModel.FilesAndFolders;
 
 			var parameters = (NavigationArguments)eventArgs.Parameter;
 			if (parameters.IsLayoutSwitch)
@@ -259,9 +265,12 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 
 		private void FolderSettings_LayoutModeChangeRequested(object? sender, LayoutModeEventArgs e)
 		{
-			if (FolderSettings.LayoutMode == FolderLayoutModes.ListView
-				|| FolderSettings.LayoutMode == FolderLayoutModes.CardsView
-				|| FolderSettings.LayoutMode == FolderLayoutModes.GridView)
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The grid layout does not have folder settings.");
+
+			if (folderSettings.LayoutMode == FolderLayoutModes.ListView
+				|| folderSettings.LayoutMode == FolderLayoutModes.CardsView
+				|| folderSettings.LayoutMode == FolderLayoutModes.GridView)
 			{
 				// SetItemTemplate clears FileList.ItemsSource on style swap, which drops the selection
 				var preservedSelection = SelectedItems?.ToList();
@@ -286,7 +295,10 @@ private void FolderSettings_LayoutModeChangeRequested(object? sender, LayoutMode
 
 		private void SetItemTemplate()
 		{
-			var newFileListStyle = FolderSettings.LayoutMode switch
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The grid layout does not have folder settings.");
+
+			var newFileListStyle = folderSettings.LayoutMode switch
 			{
 				FolderLayoutModes.ListView => (Style)Resources["VerticalLayoutGridView"],
 				FolderLayoutModes.CardsView => (Style)Resources["HorizontalLayoutGridView"],
@@ -303,7 +315,7 @@ private void SetItemTemplate()
 
 			shouldSetVerticalScrollMode = true;
 
-			switch (FolderSettings.LayoutMode)
+			switch (folderSettings.LayoutMode)
 			{
 				case FolderLayoutModes.ListView:
 					FileList.ItemTemplate = ListViewBrowserTemplate;
@@ -377,7 +389,7 @@ override public void StartRenameItem()
 				return;
 
 			TextBox? textBox = null;
-			string editText = ShouldShowExtensionInRename(RenamingItem) ? RenamingItem.ItemNameRaw : textBlock.Text;
+			string editText = ShouldShowExtensionInRename(RenamingItem) ? RenamingItem.ItemNameRaw! : textBlock.Text;
 
 			// Grid View
 			if (FolderSettings.LayoutMode == FolderLayoutModes.GridView)
@@ -431,15 +443,17 @@ override public void StartRenameItem()
 				}
 			}
 
-			textBox.Focus(FocusState.Pointer);
-			textBox.LostFocus += RenameTextBox_LostFocus;
-			textBox.KeyDown += RenameTextBox_KeyDown;
+			var activeTextBox = textBox
+				?? throw new InvalidOperationException("The rename text box is not available for the selected layout.");
+			activeTextBox.Focus(FocusState.Pointer);
+			activeTextBox.LostFocus += RenameTextBox_LostFocus;
+			activeTextBox.KeyDown += RenameTextBox_KeyDown;
 
 			int selectedTextLength = editText.Length;
 			if (!RenamingItem.IsShortcut && (ShouldShowExtensionInRename(RenamingItem) || UserSettingsService.FoldersSettingsService.ShowFileExtensions))
 				selectedTextLength -= extensionLength;
 
-			textBox.Select(0, selectedTextLength);
+			activeTextBox.Select(0, selectedTextLength);
 			IsRenamingItem = true;
 		}
 
@@ -463,25 +477,35 @@ protected override void EndRename(TextBox textBox)
 			{
 				// NOTE: Navigating away, do nothing
 			}
-			else if (FolderSettings.LayoutMode == FolderLayoutModes.GridView)
+			else
 			{
-				Popup? popup = gridViewItem.FindDescendant("EditPopup") as Popup;
-				TextBlock? textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
+				var layoutMode = (FolderSettings
+					?? throw new InvalidOperationException("The grid layout does not have folder settings."))
+					.LayoutMode;
+				if (layoutMode == FolderLayoutModes.GridView)
+				{
+					Popup? popup = gridViewItem.FindDescendant("EditPopup") as Popup;
+					TextBlock? textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
 
-				if (popup is not null)
-					popup.IsOpen = false;
+					if (popup is not null)
+						popup.IsOpen = false;
 
-				if (textBlock is not null)
-					textBlock.Opacity = (textBlock.DataContext as ListedItem)!.Opacity;
-			}
-			else if (FolderSettings.LayoutMode == FolderLayoutModes.CardsView || FolderSettings.LayoutMode == FolderLayoutModes.ListView)
-			{
-				TextBlock? textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
+					if (textBlock is not null)
+					{
+						var item = textBlock.DataContext as ListedItem
+							?? throw new InvalidOperationException("The renamed item is not available.");
+						textBlock.Opacity = item.Opacity;
+					}
+				}
+				else if (layoutMode is FolderLayoutModes.CardsView or FolderLayoutModes.ListView)
+				{
+					TextBlock? textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
 
-				textBox.Visibility = Visibility.Collapsed;
+					textBox.Visibility = Visibility.Collapsed;
 
-				if (textBlock is not null)
-					textBlock.Visibility = Visibility.Visible;
+					if (textBlock is not null)
+						textBlock.Visibility = Visibility.Visible;
+				}
 			}
 
 			// Unsubscribe from events
@@ -523,16 +547,21 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
 
 				if (ctrlPressed && !shiftPressed)
 				{
-					var folders = ParentShellPageInstance?.SlimContentPage.SelectedItems?.Where(file => file.PrimaryItemAttribute == StorageItemTypes.Folder);
-					foreach (ListedItem? folder in folders)
+					var selectedItems = ParentShellPageInstance?.SlimContentPage?.SelectedItems
+						?? throw new InvalidOperationException("The selected items are not available.");
+
+					foreach (var folder in selectedItems.Where(file => file.PrimaryItemAttribute == StorageItemTypes.Folder))
 					{
-						if (folder is not null)
-							await NavigationHelpers.OpenPathInNewTab(folder.ItemPath);
+						await NavigationHelpers.OpenPathInNewTab(folder.ItemPath);
 					}
 				}
 				else if (ctrlPressed && shiftPressed)
 				{
-					NavigationHelpers.OpenInSecondaryPane(ParentShellPageInstance, SelectedItems.FirstOrDefault(item => item.PrimaryItemAttribute == StorageItemTypes.Folder));
+					if (ParentShellPageInstance is { } parentShellPage &&
+						SelectedItems.FirstOrDefault(item => item.PrimaryItemAttribute == StorageItemTypes.Folder) is { } folder)
+					{
+						NavigationHelpers.OpenInSecondaryPane(parentShellPage, folder);
+					}
 				}
 			}
 			else if (e.Key == VirtualKey.Enter && e.KeyStatus.IsMenuKeyDown)
@@ -570,8 +599,11 @@ protected override bool CanGetItemFromElement(object element)
 
 		private void FolderSettings_IconSizeChanged()
 		{
+			var folderSettings = FolderSettings
+				?? throw new InvalidOperationException("The grid layout does not have folder settings.");
+
 			// Check if icons need to be reloaded
-			var newIconSize = LayoutSizeKindHelper.GetIconSize(FolderSettings.LayoutMode);
+			var newIconSize = LayoutSizeKindHelper.GetIconSize(folderSettings.LayoutMode);
 			if (newIconSize != currentIconSize)
 			{
 				currentIconSize = newIconSize;
@@ -581,24 +613,25 @@ private void FolderSettings_IconSizeChanged()
 
 		private async Task ReloadItemIconsAsync()
 		{
-			if (ParentShellPageInstance is null)
+			if (ParentShellPageInstance is not { } parentShellPage)
 				return;
+			var shellViewModel = parentShellPage.GetRequiredShellViewModel();
 
-			ParentShellPageInstance.ShellViewModel.CancelExtendedPropertiesLoading();
-			var filesAndFolders = ParentShellPageInstance.ShellViewModel.FilesAndFolders.ToList();
+			shellViewModel.CancelExtendedPropertiesLoading();
+			var filesAndFolders = shellViewModel.FilesAndFolders.ToList();
 			foreach (ListedItem listedItem in filesAndFolders)
 			{
 				listedItem.ItemPropertiesInitialized = false;
 				if (FileList.ContainerFromItem(listedItem) is not null)
-					await ParentShellPageInstance.ShellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
+					await shellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
 			}
 
-			if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None)
+			if (shellViewModel.EnabledGitProperties is not GitProperties.None)
 			{
 				await Task.WhenAll(filesAndFolders.Select(item =>
 				{
 					if (item is IGitItem gitItem)
-						return ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
+						return shellViewModel.LoadGitPropertiesAsync(gitItem);
 
 					return Task.CompletedTask;
 				}));
@@ -642,15 +675,18 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 			{
 				if (clickedItem is TextBlock textBlock && textBlock.Name == "ItemName")
 				{
-					CheckRenameDoubleClick(clickedItem?.DataContext);
+					CheckRenameDoubleClick(textBlock.DataContext);
 				}
 				else if (IsRenamingItem)
 				{
 					if (FileList.ContainerFromItem(RenamingItem) is GridViewItem gridViewItem)
 					{
-						if (FolderSettings.LayoutMode == FolderLayoutModes.GridView)
+						var layoutMode = (FolderSettings
+							?? throw new InvalidOperationException("The grid layout does not have folder settings."))
+							.LayoutMode;
+						if (layoutMode == FolderLayoutModes.GridView)
 						{
-							Popup popup = gridViewItem.FindDescendant("EditPopup") as Popup;
+							Popup? popup = gridViewItem.FindDescendant("EditPopup") as Popup;
 							var textBox = popup?.Child as TextBox;
 
 							if (textBox is not null)
@@ -785,7 +821,7 @@ private void SelectionCheckbox_PointerCanceled(object sender, PointerRoutedEvent
 		// To avoid crashes, disable scrolling when drag-and-drop if grouped. (#14484)
 		private bool ShouldDisableScrollingWhenDragAndDrop =>
 			FolderSettings?.LayoutMode is FolderLayoutModes.GridView or FolderLayoutModes.CardsView &&
-			(ParentShellPageInstance?.ShellViewModel.FilesAndFolders.IsGrouped ?? false);
+			(ParentShellPageInstance?.ShellViewModel?.FilesAndFolders.IsGrouped ?? false);
 
 		protected override void FileList_DragItemsStarting(object sender, DragItemsStartingEventArgs e)
 		{
@@ -841,4 +877,4 @@ private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
index 6930515eda5d..72efa4e0684a 100644
--- a/src/Files.App/Views/MainPage.xaml.cs
+++ b/src/Files.App/Views/MainPage.xaml.cs
@@ -183,7 +183,7 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur
 
 		private void PaneHolder_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
-			SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged(SidebarAdaptiveViewModel.PaneHolder.ActivePane?.TabBarItemParameter?.NavigationParameter?.ToString());
+			SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged(SidebarAdaptiveViewModel.PaneHolder?.ActivePane?.TabBarItemParameter?.NavigationParameter?.ToString());
 			UpdateStatusBarProperties();
 			UpdateNavToolbarProperties();
 			LoadPaneChanged();
@@ -199,18 +199,27 @@ private void UpdateStatusBarProperties()
 		{
 			if (StatusBar is not null)
 			{
-				StatusBar.StatusBarViewModel = SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn.SlimContentPage?.StatusBarViewModel;
-				StatusBar.SelectedItemsPropertiesViewModel = SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn.SlimContentPage?.SelectedItemsPropertiesViewModel;
+				var paneHolder = SidebarAdaptiveViewModel.PaneHolder;
+				var activePane = paneHolder is null
+					? null
+					: paneHolder.ActivePaneOrColumn ?? throw new InvalidOperationException("The pane holder does not have an active pane.");
+				StatusBar.StatusBarViewModel = activePane?.SlimContentPage?.StatusBarViewModel;
+				StatusBar.SelectedItemsPropertiesViewModel = activePane?.SlimContentPage?.SelectedItemsPropertiesViewModel;
 			}
 		}
 
 		private void UpdateNavToolbarProperties()
 		{
+			var paneHolder = SidebarAdaptiveViewModel.PaneHolder;
+			var activePane = paneHolder is null
+				? null
+				: paneHolder.ActivePaneOrColumn ?? throw new InvalidOperationException("The pane holder does not have an active pane.");
+
 			if (NavToolbar is not null)
-				NavToolbar.ViewModel = SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn.ToolbarViewModel;
+				NavToolbar.ViewModel = activePane?.ToolbarViewModel;
 
 			if (InnerNavigationToolbar is not null)
-				InnerNavigationToolbar.ViewModel = SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn.ToolbarViewModel;
+				InnerNavigationToolbar.ViewModel = activePane?.ToolbarViewModel;
 		}
 
 		protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -503,7 +512,7 @@ private void Page_PointerReleased(object sender, PointerRoutedEventArgs e)
 		{
 			// Workaround for issue where clicking an empty area in the window (toolbar, title bar etc) prevents keyboard
 			// shortcuts from working properly, see https://github.com/microsoft/microsoft-ui-xaml/issues/6467
-			DispatcherQueue.TryEnqueue(() => ContentPageContext.ShellPage?.PaneHolder.FocusActivePane());
+			DispatcherQueue.TryEnqueue(() => ContentPageContext.ShellPage?.PaneHolder?.FocusActivePane());
 		}
 
 		private void SidebarControl_ItemContextInvoked(object sender, ItemContextInvokedArgs e)
diff --git a/src/Files.App/Views/Properties/CustomizationPage.xaml b/src/Files.App/Views/Properties/CustomizationPage.xaml
index 8277320756b2..7c5420f787bb 100644
--- a/src/Files.App/Views/Properties/CustomizationPage.xaml
+++ b/src/Files.App/Views/Properties/CustomizationPage.xaml
@@ -86,7 +86,6 @@
 					x:Name="PickDllFileButton"
 					Grid.Column="1"
 					Command="{x:Bind CustomizationViewModel.OpenFilePickerCommand, Mode=OneWay}"
-					CommandParameter="{x:Bind XamlRoot, Mode=OneWay}"
 					Content="{helpers:ResourceString Name=Browse}" />
 
 			</Grid>
diff --git a/src/Files.App/Views/Properties/CustomizationPage.xaml.cs b/src/Files.App/Views/Properties/CustomizationPage.xaml.cs
index 084970c73253..f90accadbd48 100644
--- a/src/Files.App/Views/Properties/CustomizationPage.xaml.cs
+++ b/src/Files.App/Views/Properties/CustomizationPage.xaml.cs
@@ -8,7 +8,7 @@ namespace Files.App.Views.Properties
 {
 	public sealed partial class CustomizationPage : BasePropertiesPage
 	{
-		private CustomizationViewModel CustomizationViewModel { get; set; }
+		private CustomizationViewModel CustomizationViewModel { get; set; } = null!;
 
 		public CustomizationPage()
 		{
@@ -21,7 +21,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
 			base.OnNavigatedTo(e);
 
-			CustomizationViewModel = new(AppInstance, BaseProperties, parameter.Window.AppWindow);
+			CustomizationViewModel = new(
+				AppInstance,
+				BaseProperties ?? throw new InvalidOperationException("The properties model has not been initialized."),
+				(parameter.Window ?? throw new InvalidOperationException("The properties window has not been initialized.")).AppWindow);
 		}
 
 		public override async Task<bool> SaveChangesAsync()
diff --git a/src/Files.App/Views/Properties/GeneralPage.xaml.cs b/src/Files.App/Views/Properties/GeneralPage.xaml.cs
index d100014c2b6c..fdf3800ed938 100644
--- a/src/Files.App/Views/Properties/GeneralPage.xaml.cs
+++ b/src/Files.App/Views/Properties/GeneralPage.xaml.cs
@@ -5,6 +5,7 @@
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Windows.Storage;
 using Windows.Win32;
@@ -37,7 +38,9 @@ private void ItemFileName_LosingFocus(UIElement _, LosingFocusEventArgs e)
 				return;
 			}
 
-			var match = RegexHelpers.DriveLetter().Match(ViewModel.OriginalItemName);
+			var originalItemName = ViewModel.OriginalItemName
+				?? throw new InvalidOperationException("The original item name has not been initialized.");
+			var match = RegexHelpers.DriveLetter().Match(originalItemName);
 			if (match.Success)
 				ItemFileName.Text += match.Value;
 		}
@@ -65,13 +68,13 @@ public override async Task<bool> SaveChangesAsync()
 				_ => throw new UnreachableException()
 			};
 
-			bool GetNewName(out string newName)
+			bool GetNewName([NotNullWhen(true)] out string? newName)
 			{
 				if (ItemFileName is not null)
 				{
 					ViewModel.ItemName = ItemFileName.Text; // Make sure Name is updated
 					newName = ViewModel.ItemName;
-					string oldName = ViewModel.OriginalItemName;
+					string? oldName = ViewModel.OriginalItemName;
 					return !string.IsNullOrWhiteSpace(newName) && newName != oldName;
 				}
 				newName = "";
@@ -87,14 +90,15 @@ bool SaveDrive(DriveItem drive)
 				newName = RegexHelpers.DriveLetter().Replace(newName, string.Empty); // Remove "(C:)" from the new label
 
 				if (drive.Type == Data.Items.DriveType.Network)
-					Win32Helper.SetNetworkDriveLabel(drive.DeviceID, newName);
+					Win32Helper.SetNetworkDriveLabel(drive.DeviceID
+						?? throw new InvalidOperationException("The network drive does not have a device ID."), newName);
 				else
-					Win32Helper.SetVolumeLabel(drive.Path, newName);
+					Win32Helper.SetVolumeLabel(drive.GetRequiredPath(), newName);
 
 				_ = MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				{
 					await drive.UpdateLabelAsync();
-					await fsVM.SetWorkingDirectoryAsync(drive.Path);
+					await fsVM.SetWorkingDirectoryAsync(drive.GetRequiredPath());
 				});
 				return true;
 			}
@@ -107,11 +111,14 @@ async Task<bool> SaveLibraryAsync(LibraryItem library)
 
 				newName = $"{newName}{ShellLibraryItem.EXTENSION}";
 
-				var file = new StorageFileWithPath(null, library.ItemPath);
-				var renamed = await AppInstance!.FilesystemHelpers.RenameAsync(file, newName, NameCollisionOption.FailIfExists, false, false);
+				var libraryPath = library.GetRequiredPath();
+				var file = new StorageFileWithPath(null, libraryPath);
+				var renamed = await AppInstance.FilesystemHelpers.RenameAsync(file, newName, NameCollisionOption.FailIfExists, false, false);
 				if (renamed is ReturnResult.Success)
 				{
-					var newPath = Path.Combine(Path.GetDirectoryName(library.ItemPath)!, newName);
+					var libraryDirectory = Path.GetDirectoryName(libraryPath)
+						?? throw new InvalidOperationException("The library path does not have a parent directory.");
+					var newPath = Path.Combine(libraryDirectory, newName);
 					_ = MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 					{
 						await fsVM.SetWorkingDirectoryAsync(newPath);
@@ -145,7 +152,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 
 						if (ViewModel.IsAblumCoverModified)
 						{
-							MediaFileHelper.ChangeAlbumCover(fileOrFolder.ItemPath, ViewModel.ModifiedAlbumCover);
+							MediaFileHelper.ChangeAlbumCover(fileOrFolder.GetRequiredPath(), ViewModel.ModifiedAlbumCover);
 
 							await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 							{
@@ -159,6 +166,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 
 			async Task<bool> SaveBaseAsync(ListedItem item)
 			{
+				var itemPath = item.GetRequiredPath();
 				// Handle the visibility attribute for a single file
 				var itemMM = AppInstance?.SlimContentPage?.ItemManipulationModel;
 				if (itemMM is not null && ViewModel.IsHiddenEditedValue is not null) // null on homepage
@@ -169,11 +177,11 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 				}
 
 				if (ViewModel.IsUnblockFileSelected)
-					PInvoke.DeleteFileFromApp($"{item.ItemPath}:Zone.Identifier");
+					PInvoke.DeleteFileFromApp($"{itemPath}:Zone.Identifier");
 
 				if (ViewModel.IsAblumCoverModified)
 				{
-					MediaFileHelper.ChangeAlbumCover(item.ItemPath, ViewModel.ModifiedAlbumCover);
+					MediaFileHelper.ChangeAlbumCover(itemPath, ViewModel.ModifiedAlbumCover);
 
 					await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 					{
@@ -188,8 +196,9 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 				if (!GetNewName(out var newName))
 					return true;
 
+				var appInstance = AppInstance!;
 				return await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
-					UIFilesystemHelpers.RenameFileItemAsync(item, ViewModel.ItemName, AppInstance, false)
+					UIFilesystemHelpers.RenameFileItemAsync(item, newName, appInstance, false)
 				);
 			}
 		}
diff --git a/src/Files.App/Views/Properties/HashesPage.xaml.cs b/src/Files.App/Views/Properties/HashesPage.xaml.cs
index ff1f7c722e3d..1d7b6dcc55ed 100644
--- a/src/Files.App/Views/Properties/HashesPage.xaml.cs
+++ b/src/Files.App/Views/Properties/HashesPage.xaml.cs
@@ -11,7 +11,7 @@ namespace Files.App.Views.Properties
 {
 	public sealed partial class HashesPage : BasePropertiesPage
 	{
-		private HashesViewModel HashesViewModel { get; set; }
+		private HashesViewModel? HashesViewModel { get; set; }
 
 		private bool _cancel;
 
@@ -25,7 +25,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 			var parameter = (PropertiesPageNavigationParameter)e.Parameter;
 
 			if (parameter.Parameter is ListedItem listedItem)
-				HashesViewModel = new(listedItem, parameter.Window.AppWindow);
+				HashesViewModel = new(listedItem,
+					(parameter.Window ?? throw new InvalidOperationException("The properties window has not been initialized.")).AppWindow);
 
 			base.OnNavigatedTo(e);
 		}
@@ -60,7 +61,7 @@ public async override Task<bool> SaveChangesAsync()
 
 		public override void Dispose()
 		{
-			HashesViewModel.Dispose();
+			HashesViewModel?.Dispose();
 		}
 	}
 }
diff --git a/src/Files.App/Views/Properties/LibraryPage.xaml.cs b/src/Files.App/Views/Properties/LibraryPage.xaml.cs
index fe69ae35cd2e..738bb0f963e2 100644
--- a/src/Files.App/Views/Properties/LibraryPage.xaml.cs
+++ b/src/Files.App/Views/Properties/LibraryPage.xaml.cs
@@ -137,7 +137,7 @@ private void RemoveLocation()
 			}
 		}
 
-		private bool IsChanged(LibraryItem lib, out string newDefaultSaveFolder, out string[] newFolders, out bool? newIsPinned)
+		private bool IsChanged(LibraryItem lib, out string? newDefaultSaveFolder, out string[]? newFolders, out bool? newIsPinned)
 		{
 			bool isChanged = false;
 
@@ -154,7 +154,7 @@ private bool IsChanged(LibraryItem lib, out string newDefaultSaveFolder, out str
 
 			if ((lib.Folders?.Count ?? 0) != Folders.Count || lib.Folders?.SequenceEqual(Folders.Select(f => f.Path), StringComparer.OrdinalIgnoreCase) != true)
 			{
-				newFolders = Folders.Select(f => f.Path).ToArray();
+				newFolders = Folders.Select(f => f.Path!).ToArray();
 				isChanged = true;
 			}
 
@@ -176,7 +176,7 @@ public override async Task<bool> SaveChangesAsync()
 					return true;
 
 				// Skip updates and close dialog when nothing changed
-				if (!IsChanged(props.Library, out string newDefaultSaveFolder, out string[] newFolders, out bool? newIsPinned))
+				if (!IsChanged(props.Library, out var newDefaultSaveFolder, out var newFolders, out var newIsPinned))
 					return true;
 
 				while (true)
@@ -184,7 +184,7 @@ public override async Task<bool> SaveChangesAsync()
 					using var dialog = DynamicDialogFactory.GetFor_PropertySaveErrorDialog();
 					try
 					{
-						var library = await Task.Run(() => App.LibraryManager.UpdateLibrary(props.Library.ItemPath, newDefaultSaveFolder, newFolders, newIsPinned));
+						var library = await Task.Run(() => App.LibraryManager.UpdateLibrary(props.Library.ItemPath!, newDefaultSaveFolder, newFolders, newIsPinned));
 						if (library is not null)
 						{
 							props.UpdateLibrary(new LibraryItem(library));
@@ -219,7 +219,7 @@ public override void Dispose()
 
 	public sealed partial class LibraryFolder : ObservableObject
 	{
-		public string Path { get; set; }
+		public string? Path { get; set; }
 
 		private bool isDefault;
 		public bool IsDefault
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
index b9410247fe3f..68b87dff3538 100644
--- a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
+++ b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
@@ -19,9 +19,9 @@ public sealed partial class MainPropertiesPage : BasePropertiesPage
 
 		private AppWindow AppWindow => Window.AppWindow;
 
-		private Window Window;
+		private Window Window = null!;
 
-		private MainPropertiesViewModel MainPropertiesViewModel { get; set; }
+		private MainPropertiesViewModel MainPropertiesViewModel { get; set; } = null!;
 
 		public MainPropertiesPage()
 		{
@@ -55,11 +55,11 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 		{
 			var parameter = (PropertiesPageNavigationParameter)e.Parameter;
 
-			Window = parameter.Window;
+			Window = parameter.Window!;
 
 			base.OnNavigatedTo(e);
 
-			MainPropertiesViewModel = new(Window, MainContentFrame, BaseProperties, parameter);
+			MainPropertiesViewModel = new(Window, MainContentFrame, BaseProperties!, parameter);
 		}
 
 		private void Page_Loaded(object sender, RoutedEventArgs e)
diff --git a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml.cs b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml.cs
index f2aa0fd60bbb..d03a922ab966 100644
--- a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml.cs
+++ b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml.cs
@@ -8,7 +8,7 @@ namespace Files.App.Views.Properties
 {
 	public sealed partial class SecurityAdvancedPage : BasePropertiesPage
 	{
-		private SecurityAdvancedViewModel SecurityAdvancedViewModel { get; set; }
+		private SecurityAdvancedViewModel? SecurityAdvancedViewModel { get; set; }
 
 		public SecurityAdvancedPage()
 		{
diff --git a/src/Files.App/Views/Properties/SecurityPage.xaml.cs b/src/Files.App/Views/Properties/SecurityPage.xaml.cs
index b04b1b43ca3c..12079cc6219e 100644
--- a/src/Files.App/Views/Properties/SecurityPage.xaml.cs
+++ b/src/Files.App/Views/Properties/SecurityPage.xaml.cs
@@ -9,9 +9,9 @@ namespace Files.App.Views.Properties
 {
 	public sealed partial class SecurityPage : BasePropertiesPage
 	{
-		private SecurityViewModel SecurityViewModel { get; set; }
+		private SecurityViewModel SecurityViewModel { get; set; } = null!;
 
-		private object _parameter;
+		private PropertiesPageNavigationParameter _parameter = null!;
 
 		public SecurityPage()
 		{
diff --git a/src/Files.App/Views/Properties/SignaturesPage.xaml.cs b/src/Files.App/Views/Properties/SignaturesPage.xaml.cs
index 74e30800dcd2..d7f092a2cf8f 100644
--- a/src/Files.App/Views/Properties/SignaturesPage.xaml.cs
+++ b/src/Files.App/Views/Properties/SignaturesPage.xaml.cs
@@ -8,7 +8,7 @@ namespace Files.App.Views.Properties
 {
 	public sealed partial class SignaturesPage : BasePropertiesPage
 	{
-		private SignaturesViewModel SignaturesViewModel { get; set; }
+		private SignaturesViewModel? SignaturesViewModel { get; set; }
 
 		public SignaturesPage()
 		{
@@ -19,7 +19,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 		{
 			var np = (PropertiesPageNavigationParameter)e.Parameter;
 			if (np.Parameter is ListedItem listedItem)
-				SignaturesViewModel = new(listedItem, np.Window.AppWindow);
+				SignaturesViewModel = new(listedItem,
+					(np.Window ?? throw new InvalidOperationException("The properties window has not been initialized.")).AppWindow);
 
 			base.OnNavigatedTo(e);
 		}
@@ -34,7 +35,7 @@ public override Task<bool> SaveChangesAsync()
 
 		public override void Dispose()
 		{
-			SignaturesViewModel.Dispose();
+			SignaturesViewModel?.Dispose();
 		}
 	}
 }
diff --git a/src/Files.App/Views/ReleaseNotesPage.xaml.cs b/src/Files.App/Views/ReleaseNotesPage.xaml.cs
index a20e5f13098e..20c4e26bbc7c 100644
--- a/src/Files.App/Views/ReleaseNotesPage.xaml.cs
+++ b/src/Files.App/Views/ReleaseNotesPage.xaml.cs
@@ -20,7 +20,9 @@ public sealed partial class ReleaseNotesPage : Page, IDisposable
 		private FrameworkElement RootAppElement
 			=> (FrameworkElement)MainWindow.Instance.Content;
 
-		private IShellPage AppInstance { get; set; } = null!;
+		private IShellPage? appInstance;
+		private IShellPage AppInstance
+			=> appInstance ?? throw new InvalidOperationException("The release notes page has not been initialized.");
 
 		public ReleaseNotesPage()
 		{
@@ -32,7 +34,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			if (e.Parameter is not NavigationArguments parameters)
 				return;
 
-			AppInstance = parameters.AssociatedTabInstance!;
+			appInstance = parameters.AssociatedTabInstance!;
+			var shellViewModel = AppInstance.GetRequiredShellViewModel();
 
 			AppInstance.InstanceViewModel.IsPageTypeNotHome = true;
 			AppInstance.InstanceViewModel.IsPageTypeSearchResults = false;
@@ -51,8 +54,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			AppInstance.ToolbarViewModel.CanNavigateToParent = false;
 
 			// Set path of working directory empty
-			await AppInstance.ShellViewModel.SetWorkingDirectoryAsync("ReleaseNotes");
-			AppInstance.ShellViewModel.CheckForBackgroundImage();
+			await shellViewModel.SetWorkingDirectoryAsync("ReleaseNotes");
+			shellViewModel.CheckForBackgroundImage();
 
 			AppInstance.SlimContentPage?.StatusBarViewModel.UpdateGitInfo(false, string.Empty, null);
 
diff --git a/src/Files.App/Views/Settings/AppearancePage.xaml b/src/Files.App/Views/Settings/AppearancePage.xaml
index a48612100af2..81bb208c0535 100644
--- a/src/Files.App/Views/Settings/AppearancePage.xaml
+++ b/src/Files.App/Views/Settings/AppearancePage.xaml
@@ -19,11 +19,11 @@
 			<DataTemplate x:Key="AppThemeResourcesItemTemplate" x:DataType="dataitem:AppThemeResourceItem">
 				<Grid
 					Width="120"
-					AutomationProperties.Name="{x:Bind Name, Mode=OneWay}"
+					AutomationProperties.Name="{x:Bind Name, Mode=OneTime}"
 					BorderBrush="{ThemeResource ControlElevationBorderBrush}"
 					BorderThickness="1"
 					CornerRadius="6"
-					ToolTipService.ToolTip="{x:Bind Name, Mode=OneWay}">
+					ToolTipService.ToolTip="{x:Bind Name, Mode=OneTime}">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="16" />
 						<RowDefinition Height="50" />
@@ -33,7 +33,7 @@
 					<Border
 						Grid.RowSpan="2"
 						Height="66"
-						Background="{x:Bind BackgroundColor, Converter={StaticResource StringToBrushConverter}, Mode=OneWay}"
+						Background="{x:Bind BackgroundColor, Converter={StaticResource StringToBrushConverter}, Mode=OneTime}"
 						CornerRadius="4,4,0,0" />
 
 					<!--  Tab Bar  -->
@@ -71,7 +71,7 @@
 						Grid.Row="2"
 						Padding="4"
 						HorizontalAlignment="Center"
-						Text="{x:Bind Name, Mode=OneWay}"
+						Text="{x:Bind Name, Mode=OneTime}"
 						TextTrimming="CharacterEllipsis" />
 				</Grid>
 			</DataTemplate>
diff --git a/src/Files.App/Views/Settings/AppearancePage.xaml.cs b/src/Files.App/Views/Settings/AppearancePage.xaml.cs
index 90d59c8cc40c..b29f9b4ac7a5 100644
--- a/src/Files.App/Views/Settings/AppearancePage.xaml.cs
+++ b/src/Files.App/Views/Settings/AppearancePage.xaml.cs
@@ -8,7 +8,9 @@ namespace Files.App.Views.Settings
 {
 	public sealed partial class AppearancePage : Page
 	{
-		private AppearanceViewModel ViewModel => DataContext as AppearanceViewModel;
+		private AppearanceViewModel ViewModel
+			=> DataContext as AppearanceViewModel
+				?? throw new InvalidOperationException("The appearance view model has not been initialized.");
 
 		public AppearancePage()
 		{
diff --git a/src/Files.App/Views/Settings/GeneralPage.xaml.cs b/src/Files.App/Views/Settings/GeneralPage.xaml.cs
index 8113c7d24b02..bad5ee120d9d 100644
--- a/src/Files.App/Views/Settings/GeneralPage.xaml.cs
+++ b/src/Files.App/Views/Settings/GeneralPage.xaml.cs
@@ -17,7 +17,8 @@ public GeneralPage()
 
 		private void RemoveStartupPage(object sender, RoutedEventArgs e)
 		{
-			ViewModel.RemovePageCommand.Execute((sender as FrameworkElement).DataContext as PageOnStartupViewModel);
+			if (sender is FrameworkElement { DataContext: PageOnStartupViewModel page })
+				ViewModel.RemovePageCommand.Execute(page);
 		}
 	}
 }
diff --git a/src/Files.App/Views/Settings/SettingsPage.xaml.cs b/src/Files.App/Views/Settings/SettingsPage.xaml.cs
index ddaf6fbe9b5c..618ac9d4c650 100644
--- a/src/Files.App/Views/Settings/SettingsPage.xaml.cs
+++ b/src/Files.App/Views/Settings/SettingsPage.xaml.cs
@@ -19,7 +19,9 @@ public sealed partial class SettingsPage : Page
 
 		public SettingsPageViewModel ViewModel { get; } = new();
 
-		private IShellPage AppInstance { get; set; } = null!;
+		private IShellPage? appInstance;
+		private IShellPage AppInstance
+			=> appInstance ?? throw new InvalidOperationException("The settings page has not been initialized.");
 
 		public SettingsPage()
 		{
@@ -36,7 +38,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			if (e.Parameter is not NavigationArguments navArgs)
 				return;
 
-			AppInstance = navArgs.AssociatedTabInstance!;
+			appInstance = navArgs.AssociatedTabInstance!;
+			var shellViewModel = AppInstance.GetRequiredShellViewModel();
 
 			AppInstance.InstanceViewModel.IsPageTypeNotHome = true;
 			AppInstance.InstanceViewModel.IsPageTypeSearchResults = false;
@@ -55,8 +58,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			AppInstance.ToolbarViewModel.CanGoForward = AppInstance.CanNavigateForward;
 			AppInstance.ToolbarViewModel.CanNavigateToParent = false;
 
-			await AppInstance.ShellViewModel.SetWorkingDirectoryAsync("Settings");
-			AppInstance.ShellViewModel.CheckForBackgroundImage();
+			await shellViewModel.SetWorkingDirectoryAsync("Settings");
+			shellViewModel.CheckForBackgroundImage();
 
 			AppInstance.SlimContentPage?.StatusBarViewModel.UpdateGitInfo(false, string.Empty, null);
 			AppInstance.SlimContentPage?.InfoPaneViewModel.UpdateSelectedItemPreviewAsync();
diff --git a/src/Files.App/Views/Settings/TagsPage.xaml b/src/Files.App/Views/Settings/TagsPage.xaml
index 7ff71546073c..f3aad058737f 100644
--- a/src/Files.App/Views/Settings/TagsPage.xaml
+++ b/src/Files.App/Views/Settings/TagsPage.xaml
@@ -162,7 +162,7 @@
 							Padding="12"
 							HorizontalAlignment="Stretch"
 							AllowDrop="True"
-							CanReorderItems="{x:Bind AllowItemsDrag, Mode=OneWay}"
+							CanReorderItems="{x:Bind AllowItemsDrag, Mode=OneTime}"
 							IsItemClickEnabled="True"
 							ItemsSource="{x:Bind ViewModel.Tags, Mode=TwoWay}"
 							ReorderMode="Enabled"
diff --git a/src/Files.App/Views/Settings/TagsPage.xaml.cs b/src/Files.App/Views/Settings/TagsPage.xaml.cs
index 43e5ae345d40..fb51fc42864b 100644
--- a/src/Files.App/Views/Settings/TagsPage.xaml.cs
+++ b/src/Files.App/Views/Settings/TagsPage.xaml.cs
@@ -53,26 +53,29 @@ private void EditTag_Click(object sender, RoutedEventArgs e)
 				editingTag.NewColor = editingTag.Tag.Color;
 			}
 
-			editingTag = (ListedTagViewModel)((Button)sender).DataContext;
+			if (sender is not Button { DataContext: ListedTagViewModel tag })
+				return;
+
+			editingTag = tag;
 			editingTag.NewColor = editingTag.Tag.Color;
 			editingTag.NewName = editingTag.Tag.Name;
 			editingTag.IsEditing = true;
 
-			var item = (ListViewItem)TagsList.ContainerFromItem(editingTag);
-			var textBlock = item.FindDescendant("TagName") as TextBlock;
-			var textBox = item.FindDescendant("TagNameTextBox") as TextBox;
+			var item = (TagsList.ContainerFromItem(editingTag) as ListViewItem)!;
+			var textBlock = (item.FindDescendant("TagName") as TextBlock)!;
+			var textBox = (item.FindDescendant("TagNameTextBox") as TextBox)!;
 
-			textBox!.TextChanged += RenameTextBox_TextChanged;
+			textBox.TextChanged += RenameTextBox_TextChanged;
 
-			textBox!.Text = textBlock!.Text;
+			textBox.Text = textBlock.Text;
 			oldTagName = textBlock.Text;
 		}
 
 		private void CommitRenameTag_Click(object sender, RoutedEventArgs e)
 		{
-			var item = (ListViewItem)TagsList.ContainerFromItem(editingTag);
+			var item = (TagsList.ContainerFromItem(editingTag) as ListViewItem)!;
 
-			CommitChanges(item.FindDescendant("TagNameTextBox") as TextBox);
+			CommitChanges((item.FindDescendant("TagNameTextBox") as TextBox)!);
 		}
 
 		private void CancelRenameTag_Click(object sender, RoutedEventArgs e)
@@ -97,12 +100,13 @@ private void RemoveTag_Click(object sender, RoutedEventArgs e)
 
 		private void RenameTextBox_TextChanged(object sender, TextChangedEventArgs e)
 		{
+			var tag = editingTag!;
 			var text = ((TextBox)sender).Text;
 			var isNullOrEmpty = string.IsNullOrEmpty(text);
-			editingTag!.IsNameValid = isNullOrEmpty || (IsNameValid(text) && !ViewModel.Tags.Any(tag => tag.Tag.Name == text && editingTag!.Tag.Name != text));
-			editingTag!.CanCommit = !isNullOrEmpty && editingTag!.IsNameValid && (
-				text != editingTag!.Tag.Name ||
-				editingTag!.NewColor != editingTag!.Tag.Color
+			tag.IsNameValid = isNullOrEmpty || (IsNameValid(text) && !ViewModel.Tags.Any(item => item.Tag.Name == text && tag.Tag.Name != text));
+			tag.CanCommit = !isNullOrEmpty && tag.IsNameValid && (
+				text != tag.Tag.Name ||
+				tag.NewColor != tag.Tag.Color
 			);
 		}
 
@@ -111,9 +115,9 @@ private void EditColorPicker_ColorChanged(ColorPicker sender, ColorChangedEventA
 			if (editingTag is null)
 				return;
 
-			editingTag!.CanCommit = editingTag!.IsNameValid && (
-				editingTag!.NewName != editingTag!.Tag.Name ||
-				CommunityToolkit.WinUI.Helpers.ColorHelper.ToHex(sender.Color) != editingTag!.Tag.Color
+			editingTag.CanCommit = editingTag.IsNameValid && (
+				editingTag.NewName != editingTag.Tag.Name ||
+				CommunityToolkit.WinUI.Helpers.ColorHelper.ToHex(sender.Color) != editingTag.Tag.Color
 			);
 		}
 
@@ -135,10 +139,11 @@ private void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcc
 
 		private void CommitChanges(TextBox textBox)
 		{
+			var tag = editingTag!;
 			EndEditing(textBox);
 			string newTagName = textBox.Text.Trim().TrimEnd('.');
-			if (newTagName != oldTagName || editingTag!.NewColor != editingTag.Tag.Color)
-				ViewModel.EditExistingTag(editingTag!, newTagName, editingTag!.NewColor);
+			if (newTagName != oldTagName || tag.NewColor != tag.Tag.Color)
+				ViewModel.EditExistingTag(tag, newTagName, tag.NewColor);
 		}
 
 		private void EndEditing(TextBox textBox)
@@ -149,12 +154,15 @@ private void EndEditing(TextBox textBox)
 
 		private void CloseEdit()
 		{
-			var item = (ListViewItem)TagsList.ContainerFromItem(editingTag);
-			editingTag!.NewColor = editingTag.Tag.Color;
-			editingTag!.IsNameValid = true;
-			editingTag!.CanCommit = false;
+			var tag = editingTag!;
+			var item = (TagsList.ContainerFromItem(tag) as ListViewItem)!;
+			var textBox = (item.FindDescendant("TagNameTextBox") as TextBox)!;
 
-			EndEditing(item.FindDescendant("TagNameTextBox") as TextBox);
+			tag.NewColor = tag.Tag.Color;
+			tag.IsNameValid = true;
+			tag.CanCommit = false;
+
+			EndEditing(textBox);
 		}
 
 		private bool IsNameValid(string name)
diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs
index 73e8486b1a7b..24192cb55c3c 100644
--- a/src/Files.App/Views/ShellPanesPage.xaml.cs
+++ b/src/Files.App/Views/ShellPanesPage.xaml.cs
@@ -72,7 +72,7 @@ public bool IsMultiPaneAvailable
 			}
 		}
 
-		public IShellPage ActivePaneOrColumn
+		public IShellPage? ActivePaneOrColumn
 		{
 			get
 			{
@@ -80,7 +80,7 @@ public IShellPage ActivePaneOrColumn
 				if (ActivePane is not null && ActivePane.IsColumnView && ActivePane.SlimContentPage is ColumnsLayoutPage columnLayoutPage)
 					return columnLayoutPage.ActiveColumnShellPage;
 
-				return ActivePane ?? GetPane(0)!;
+				return ActivePane ?? GetPane(0);
 			}
 		}
 
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
index 9b5c9063df83..5d58ce18b494 100644
--- a/src/Files.App/Views/Shells/BaseShellPage.cs
+++ b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -48,7 +48,7 @@ public abstract class BaseShellPage : Page, IShellPage, INotifyPropertyChanged
 
 		public NavigationToolbarViewModel ToolbarViewModel { get; } = new NavigationToolbarViewModel();
 
-		public IBaseLayoutPage SlimContentPage => ContentPage;
+		public IBaseLayoutPage? SlimContentPage => ContentPage;
 
 		public IFilesystemHelpers FilesystemHelpers { get; protected set; }
 
@@ -70,12 +70,12 @@ public abstract class BaseShellPage : Page, IShellPage, INotifyPropertyChanged
 
 		public virtual IList<PageStackEntry> BackwardStack => ItemDisplay.BackStack;
 
-		public ShellViewModel ShellViewModel { get; protected set; }
+		public ShellViewModel? ShellViewModel { get; protected set; }
 
 		public CurrentInstanceViewModel InstanceViewModel { get; }
 
-		protected BaseLayoutPage _ContentPage;
-		public BaseLayoutPage ContentPage
+		protected BaseLayoutPage? _ContentPage;
+		public BaseLayoutPage? ContentPage
 		{
 			get => _ContentPage;
 			set
@@ -90,13 +90,13 @@ public BaseLayoutPage ContentPage
 					NotifyPropertyChanged(nameof(ContentPage));
 					NotifyPropertyChanged(nameof(SlimContentPage));
 					if (value is not null)
-						_ContentPage.StatusBarViewModel.CheckoutRequested += GitCheckout_Required;
+						value.StatusBarViewModel.CheckoutRequested += GitCheckout_Required;
 				}
 			}
 		}
 
-		protected IShellPanesPage _PaneHolder;
-		public IShellPanesPage PaneHolder
+		protected IShellPanesPage? _PaneHolder;
+		public IShellPanesPage? PaneHolder
 		{
 			get => _PaneHolder;
 			set
@@ -110,8 +110,8 @@ public IShellPanesPage PaneHolder
 			}
 		}
 
-		protected TabBarItemParameter _TabItemArguments;
-		public TabBarItemParameter TabBarItemParameter
+		protected TabBarItemParameter? _TabItemArguments;
+		public TabBarItemParameter? TabBarItemParameter
 		{
 			get => _TabItemArguments;
 			set
@@ -120,7 +120,9 @@ public TabBarItemParameter TabBarItemParameter
 				{
 					_TabItemArguments = value;
 
-					ContentChanged?.Invoke(this, value);
+					ContentChanged?.Invoke(
+						this,
+						value ?? throw new InvalidOperationException("The tab content arguments cannot be cleared."));
 				}
 			}
 		}
@@ -156,7 +158,7 @@ public bool IsCurrentInstance
 
 		public event PropertyChangedEventHandler? PropertyChanged;
 
-		public event EventHandler<TabBarItemParameter> ContentChanged;
+		public event EventHandler<TabBarItemParameter>? ContentChanged;
 
 		public BaseShellPage(CurrentInstanceViewModel instanceViewModel)
 		{
@@ -206,36 +208,43 @@ protected void NotifyPropertyChanged([CallerMemberName] string propertyName = ""
 			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 		}
 
-		protected void FilesystemViewModel_PageTypeUpdated(object sender, PageTypeUpdatedEventArgs e)
+		protected void FilesystemViewModel_PageTypeUpdated(object? sender, PageTypeUpdatedEventArgs e)
 		{
 			InstanceViewModel.IsPageTypeCloudDrive = e.IsTypeCloudDrive;
 		}
 
-		protected void FilesystemViewModel_OnSelectionRequestedEvent(object sender, List<ListedItem> e)
+		protected void FilesystemViewModel_OnSelectionRequestedEvent(object? sender, List<ListedItem> e)
 		{
+			var contentPage = ContentPage
+				?? throw new InvalidOperationException("The content page is not available for selection.");
+
 			// Raised by the directory watcher, which can fire while the user is typing in the
 			// omnibar - don't yank focus in that case (the omnibar's TryCancel doesn't help here
 			// because FocusFileList -> ListViewItem.Focus uses FocusState.Keyboard).
 			if (!UIHelpers.IsTextInputFocused(XamlRoot))
-				ContentPage.ItemManipulationModel.FocusFileList();
-			ContentPage.ItemManipulationModel.SetSelectedItems(e);
+				contentPage.ItemManipulationModel.FocusFileList();
+			contentPage.ItemManipulationModel.SetSelectedItems(e);
 		}
 
-		protected async void FilesystemViewModel_DirectoryInfoUpdated(object sender, EventArgs e)
+		protected async void FilesystemViewModel_DirectoryInfoUpdated(object? sender, EventArgs e)
 		{
 			if (ContentPage is null)
 				return;
 
-			var directoryItemCountLocalization = Strings.Items.GetLocalizedFormatResource(ShellViewModel.FilesAndFolders.Count);
+			var shellViewModel = this.GetRequiredShellViewModel();
+
+			var directoryItemCountLocalization = Strings.Items.GetLocalizedFormatResource(shellViewModel.FilesAndFolders.Count);
 
-			BranchItem? headBranch = headBranch = InstanceViewModel.IsGitRepository
+			BranchItem? headBranch = InstanceViewModel.IsGitRepository
 					? await GitHelpers.GetRepositoryHead(InstanceViewModel.GitRepositoryPath)
 					: null;
 
-			if (InstanceViewModel.GitRepositoryPath != ShellViewModel.GitDirectory)
+			shellViewModel = this.GetRequiredShellViewModel();
+
+			if (InstanceViewModel.GitRepositoryPath != shellViewModel.GitDirectory)
 			{
-				InstanceViewModel.GitRepositoryPath = ShellViewModel.GitDirectory;
-				InstanceViewModel.IsGitRepository = ShellViewModel.IsValidGitDirectory;
+				InstanceViewModel.GitRepositoryPath = shellViewModel.GitDirectory;
+				InstanceViewModel.IsGitRepository = shellViewModel.IsValidGitDirectory;
 
 				InstanceViewModel.GitBranchName = headBranch is not null
 					? headBranch.Name
@@ -268,12 +277,12 @@ protected async void FilesystemViewModel_DirectoryInfoUpdated(object sender, Eve
 					headBranch);
 			}
 
-			contentPage.StatusBarViewModel.DirectoryItemCount = $"{ShellViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";
-			contentPage.InfoPaneViewModel.DirectoryItemCount = $"{ShellViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";
+			contentPage.StatusBarViewModel.DirectoryItemCount = $"{shellViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";
+			contentPage.InfoPaneViewModel.DirectoryItemCount = $"{shellViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";
 			contentPage.UpdateSelectionSize();
 		}
 
-		protected async void FilesystemViewModel_GitDirectoryUpdated(object sender, EventArgs e)
+		protected async void FilesystemViewModel_GitDirectoryUpdated(object? sender, EventArgs e)
 		{
 			if (GitHelpers.IsExecutingGitAction)
 				return;
@@ -294,14 +303,22 @@ protected async void FilesystemViewModel_GitDirectoryUpdated(object sender, Even
 
 		protected async void GitCheckout_Required(object? sender, string branchName)
 		{
-			if (!await GitHelpers.Checkout(ShellViewModel.GitDirectory, branchName))
+			var shellViewModel = this.GetRequiredShellViewModel();
+
+			if (!await GitHelpers.Checkout(shellViewModel.GitDirectory, branchName))
 			{
-				_ContentPage.StatusBarViewModel.ShowLocals = true;
-				_ContentPage.StatusBarViewModel.SelectedBranchIndex = StatusBarViewModel.ACTIVE_BRANCH_INDEX;
+				var contentPage = ContentPage
+					?? throw new InvalidOperationException("The content page is not available after Git checkout failed.");
+
+				contentPage.StatusBarViewModel.ShowLocals = true;
+				contentPage.StatusBarViewModel.SelectedBranchIndex = StatusBarViewModel.ACTIVE_BRANCH_INDEX;
 			}
 			else
 			{
-				ContentPage.StatusBarViewModel.UpdateGitInfo(
+				var contentPage = ContentPage
+					?? throw new InvalidOperationException("The content page is not available after Git checkout.");
+
+				contentPage.StatusBarViewModel.UpdateGitInfo(
 					InstanceViewModel.IsGitRepository,
 					InstanceViewModel.GitRepositoryPath,
 					await GitHelpers.GetRepositoryHead(InstanceViewModel.GitRepositoryPath));
@@ -340,22 +357,22 @@ protected void ShellPage_PreviewKeyDown(object sender, KeyRoutedEventArgs args)
 			}
 		}
 
-		protected void AppSettings_SortDirectionPreferenceUpdated(object sender, SortDirection e)
+		protected void AppSettings_SortDirectionPreferenceUpdated(object? sender, SortDirection e)
 		{
 			ShellViewModel?.UpdateSortDirectionStatusAsync();
 		}
 
-		protected void AppSettings_SortOptionPreferenceUpdated(object sender, SortOption e)
+		protected void AppSettings_SortOptionPreferenceUpdated(object? sender, SortOption e)
 		{
 			ShellViewModel?.UpdateSortOptionStatusAsync();
 		}
 
-		protected void AppSettings_SortDirectoriesAlongsideFilesPreferenceUpdated(object sender, bool e)
+		protected void AppSettings_SortDirectoriesAlongsideFilesPreferenceUpdated(object? sender, bool e)
 		{
 			ShellViewModel?.UpdateSortDirectoriesAlongsideFilesAsync();
 		}
 
-		protected void AppSettings_SortFilesFirstPreferenceUpdated(object sender, bool e)
+		protected void AppSettings_SortFilesFirstPreferenceUpdated(object? sender, bool e)
 		{
 			ShellViewModel?.UpdateSortFilesFirstAsync();
 		}
@@ -373,16 +390,22 @@ protected void CoreWindow_PointerPressed(object sender, PointerRoutedEventArgs a
 
 		protected async void ShellPage_PathBoxItemDropped(object sender, PathBoxItemDroppedEventArgs e)
 		{
-			await FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.Package, e.Path, false, true);
+			var package = e.Package
+				?? throw new InvalidOperationException("The dropped data package is not available.");
+			var destination = e.Path
+				?? throw new InvalidOperationException("The drop destination is not available.");
+			await FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, package, destination, false, true);
 			e.SignalEvent?.Set();
 		}
 
 		protected async void NavigationToolbar_QuerySubmitted(object sender, ToolbarQuerySubmittedEventArgs e)
 		{
-			await ToolbarViewModel.CheckPathInputAsync(e.QueryText, ToolbarViewModel.PathComponents.LastOrDefault()?.Path, this);
+			var queryText = e.QueryText
+				?? throw new InvalidOperationException("The submitted navigation query is missing.");
+			await ToolbarViewModel.CheckPathInputAsync(queryText, ToolbarViewModel.PathComponents.LastOrDefault()?.Path, this);
 		}
 
-		protected async void DrivesManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+		protected async void DrivesManager_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName == "ShowUserConsentOnInit")
 				await DisplayFilesystemConsentDialogAsync();
@@ -393,13 +416,13 @@ protected async void DrivesManager_PropertyChanged(object sender, PropertyChange
 		// Ensure that the path bar gets updated for user interaction
 		// whenever the path changes.We will get the individual directories from
 		// the updated, most-current path and add them to the UI.
-		public async Task UpdatePathUIToWorkingDirectoryAsync(string newWorkingDir, string singleItemOverride = null)
+		public async Task UpdatePathUIToWorkingDirectoryAsync(string? newWorkingDir, string? singleItemOverride = null)
 		{
-			if (ToolbarViewModel?.PathComponents is null)
-				return;
-
 			if (string.IsNullOrWhiteSpace(singleItemOverride))
 			{
+				if (newWorkingDir is null)
+					throw new InvalidOperationException("The working directory is not available for the path bar.");
+
 				cts = new CancellationTokenSource();
 
 				var components = await StorageFileExtensions.GetDirectoryPathComponentsWithDisplayNameAsync(newWorkingDir);
@@ -445,23 +468,25 @@ public async Task UpdatePathUIToWorkingDirectoryAsync(string newWorkingDir, stri
 
 		public void SubmitSearch(string query)
 		{
-			ShellViewModel.CancelSearch();
+			var shellViewModel = this.GetRequiredShellViewModel();
+
+			shellViewModel.CancelSearch();
 			InstanceViewModel.CurrentSearchQuery = query;
 
 			var args = new NavigationArguments()
 			{
 				AssociatedTabInstance = this,
 				IsSearchResultPage = true,
-				SearchPathParam = ShellViewModel.WorkingDirectory,
+				SearchPathParam = shellViewModel.WorkingDirectory,
 				SearchQuery = query,
 			};
 
-			var layout = InstanceViewModel.FolderSettings.GetLayoutType(ShellViewModel.WorkingDirectory);
+			var layout = InstanceViewModel.FolderSettings.GetLayoutType(shellViewModel.WorkingDirectory);
 
 			if (layout == typeof(ColumnsLayoutPage))
-				NavigateToPath(ShellViewModel.WorkingDirectory, typeof(DetailsLayoutPage), args);
+				NavigateToPath(shellViewModel.WorkingDirectory, typeof(DetailsLayoutPage), args);
 			else
-				NavigateToPath(ShellViewModel.WorkingDirectory, layout, args);
+				NavigateToPath(shellViewModel.WorkingDirectory, layout, args);
 		}
 
 		public void NavigateWithArguments(Type sourcePageType, NavigationArguments navArgs)
@@ -482,17 +507,20 @@ public void NavigateToPath(string navigationPath, NavigationArguments? navArgs =
 
 		public Task TabItemDragOver(object sender, DragEventArgs e)
 		{
-			return SlimContentPage?.CommandsViewModel.DragOverAsync(e);
+			return SlimContentPage?.CommandsViewModel?.DragOverAsync(e)
+				?? throw new InvalidOperationException("The tab content is not available for drag-over.");
 		}
 
 		public Task TabItemDrop(object sender, DragEventArgs e)
 		{
-			return SlimContentPage?.CommandsViewModel.DropAsync(e);
+			return SlimContentPage?.CommandsViewModel?.DropAsync(e)
+				?? throw new InvalidOperationException("The tab content is not available for drop.");
 		}
 
 		public async Task RefreshIfNoWatcherExistsAsync()
 		{
-			if (ShellViewModel.HasNoWatcher)
+			var shellViewModel = this.GetRequiredShellViewModel();
+			if (shellViewModel.HasNoWatcher)
 				await Refresh_Click();
 		}
 
@@ -500,19 +528,29 @@ public async Task Refresh_Click()
 		{
 			if (InstanceViewModel.IsPageTypeSearchResults)
 			{
+				var shellViewModel = this.GetRequiredShellViewModel();
+				var searchQuery = InstanceViewModel.CurrentSearchQuery;
+				if (searchQuery is null)
+				{
+					var tabArguments = TabBarItemParameter
+						?? throw new InvalidOperationException("The tab navigation arguments are not available for search refresh.");
+					searchQuery = (string?)tabArguments.NavigationParameter;
+				}
+
 				ToolbarViewModel.CanRefresh = false;
 				var searchInstance = new FolderSearch
 				{
-					Query = InstanceViewModel.CurrentSearchQuery ?? (string)TabBarItemParameter.NavigationParameter,
-					Folder = ShellViewModel.WorkingDirectory,
+					Query = searchQuery,
+					Folder = shellViewModel.WorkingDirectory,
 				};
 
-				await ShellViewModel.SearchAsync(searchInstance);
+				await shellViewModel.SearchAsync(searchInstance);
 			}
 			else if (CurrentPageType != typeof(HomePage))
 			{
+				var shellViewModel = this.GetRequiredShellViewModel();
 				ToolbarViewModel.CanRefresh = false;
-				ShellViewModel?.RefreshItems(null);
+				shellViewModel.RefreshItems(null);
 			}
 			else if (ItemDisplay.Content is HomePage homePage)
 			{
@@ -589,7 +627,7 @@ public void RaiseContentChanged(IShellPage instance, TabBarItemParameter args)
 			ContentChanged?.Invoke(instance, args);
 		}
 
-		protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadStatusChangedEventArgs e)
+		protected void FilesystemViewModel_ItemLoadStatusChanged(object? sender, ItemLoadStatusChangedEventArgs e)
 		{
 			switch (e.Status)
 			{
@@ -617,15 +655,19 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 
 					ToolbarViewModel.CanRefresh = true;
 					// Select previous directory
-					if (!string.IsNullOrWhiteSpace(e.PreviousDirectory) &&
-						e.PreviousDirectory.Contains(e.Path, StringComparison.Ordinal) &&
+					var path = e.Path;
+					if (path is not null &&
+						!string.IsNullOrWhiteSpace(e.PreviousDirectory) &&
+						e.PreviousDirectory.Contains(
+							path,
+							StringComparison.Ordinal) &&
 						!e.PreviousDirectory.Contains(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
 					{
 						// Remove the WorkingDir from previous dir
-						e.PreviousDirectory = e.PreviousDirectory.Replace(e.Path, string.Empty, StringComparison.Ordinal);
+						e.PreviousDirectory = e.PreviousDirectory.Replace(path, string.Empty, StringComparison.Ordinal);
 
-						var isNetwork = e.Path.StartsWith("\\\\", StringComparison.Ordinal);
-						var isFtp = FtpHelpers.IsFtpPath(e.Path);
+						var isNetwork = path.StartsWith("\\\\", StringComparison.Ordinal);
+						var isFtp = FtpHelpers.IsFtpPath(path);
 						var separator = isFtp ? "/" : "\\";
 
 						// Get previous dir name
@@ -635,7 +677,7 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 							e.PreviousDirectory = e.PreviousDirectory.Split(separator)[0];
 
 						// Get the first folder and combine it with WorkingDir
-						string folderToSelect = e.Path + separator + e.PreviousDirectory;
+						string folderToSelect = path + separator + e.PreviousDirectory;
 
 						// Make sure we don't get double separators in the e.Path
 						folderToSelect = folderToSelect.Replace(separator + separator, separator, StringComparison.Ordinal);
@@ -648,7 +690,8 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 						if (folderToSelect.EndsWith(separator))
 							folderToSelect = folderToSelect.Remove(folderToSelect.Length - 1, 1);
 
-						var itemToSelect = ShellViewModel.FilesAndFolders.ToList().FirstOrDefault((item) => item.ItemPath == folderToSelect);
+						var shellViewModel = this.GetRequiredShellViewModel();
+						var itemToSelect = shellViewModel.FilesAndFolders.ToList().FirstOrDefault((item) => item.ItemPath == folderToSelect);
 
 						if (itemToSelect is not null && ContentPage is not null && userSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp)
 						{
@@ -660,7 +703,7 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 			}
 		}
 
-		private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
+		private void FolderSettings_LayoutPreferencesUpdateRequired(object? sender, LayoutPreferenceEventArgs e)
 		{
 			if (ShellViewModel is null)
 				return;
@@ -670,7 +713,7 @@ private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, Layou
 				AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList());
 		}
 
-		protected virtual void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e)
+		protected virtual void ViewModel_WorkingDirectoryModified(object? sender, WorkingDirectoryModifiedEventArgs e)
 		{
 		}
 
@@ -689,7 +732,7 @@ protected void InitToolbarCommands()
 			ToolbarViewModel.UpdateCommand = new AsyncRelayCommand(async () => await updateSettingsService.DownloadUpdatesAsync());
 		}
 
-		protected async Task<BaseLayoutPage> GetContentOrNullAsync()
+		protected async Task<BaseLayoutPage?> GetContentOrNullAsync()
 		{
 			// WINUI3: Make sure not to run this synchronously, do not use EnqueueAsync
 			var tcs = new TaskCompletionSource<object?>();
@@ -718,9 +761,9 @@ await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 			}
 		}
 
-		protected void SelectSidebarItemFromPath(Type incomingSourcePageType = null)
+		protected void SelectSidebarItemFromPath(Type? incomingSourcePageType = null)
 		{
-			if (incomingSourcePageType == typeof(HomePage) && incomingSourcePageType is not null)
+			if (incomingSourcePageType == typeof(HomePage))
 				ToolbarViewModel.PathControlDisplayText = Strings.Home.GetLocalizedResource();
 		}
 
@@ -728,10 +771,14 @@ protected void SetLoadingIndicatorForTabs(bool isLoading)
 		{
 			try
 			{
-				var multitaskingControls = ((MainWindow.Instance.Content as Frame).Content as MainPage).ViewModel.MultitaskingControls;
+				var mainPage = (MainWindow.Instance.Content as Frame)?.Content as MainPage
+					?? throw new InvalidOperationException("The main page is not available for updating tab loading indicators.");
 
-				foreach (var x in multitaskingControls)
-					x.SetLoadingIndicatorStatus(x.Items.FirstOrDefault(x => x.TabItemContent == PaneHolder), isLoading);
+				foreach (var tabBar in mainPage.ViewModel.MultitaskingControls)
+				{
+					if (tabBar.Items.FirstOrDefault(item => item.TabItemContent == PaneHolder) is { } tabItem)
+						tabBar.SetLoadingIndicatorStatus(tabItem, isLoading);
+				}
 			}
 			catch (COMException)
 			{
@@ -755,7 +802,14 @@ private void HandleBackForwardRequest(PageStackEntry pageContent)
 
 			// Update layout type
 			if (pageContent.SourcePageType != typeof(HomePage))
-				InstanceViewModel.FolderSettings.GetLayoutType(incomingPageNavPath.IsSearchResultPage ? incomingPageNavPath.SearchPathParam : incomingPageNavPath.NavPathParam);
+			{
+				var navigationArguments = incomingPageNavPath
+					?? throw new InvalidOperationException("The navigation entry does not contain navigation arguments.");
+				var path = navigationArguments.IsSearchResultPage
+					? navigationArguments.SearchPathParam
+					: navigationArguments.NavPathParam;
+				InstanceViewModel.FolderSettings.GetLayoutType(path);
+			}
 
 			SelectSidebarItemFromPath(pageContent.SourcePageType);
 		}
diff --git a/src/Files.App/Views/Shells/ColumnShellPage.xaml.cs b/src/Files.App/Views/Shells/ColumnShellPage.xaml.cs
index 0904d2ee477b..47405709793c 100644
--- a/src/Files.App/Views/Shells/ColumnShellPage.xaml.cs
+++ b/src/Files.App/Views/Shells/ColumnShellPage.xaml.cs
@@ -23,8 +23,8 @@ public override bool CanNavigateForward
 		protected override Frame ItemDisplay
 			=> ItemDisplayFrame;
 
-		private ColumnParam _ColumnParams;
-		public ColumnParam ColumnParams
+		private ColumnParam? _ColumnParams;
+		public ColumnParam? ColumnParams
 		{
 			get => _ColumnParams;
 			set
@@ -66,38 +66,32 @@ protected override void OnNavigationParamsChanged()
 
 			if (ColumnParams.NavPathParam is not null)
 				// This method call is required to load the sorting preferences.
-				InstanceViewModel?.FolderSettings?.GetLayoutType(ColumnParams.NavPathParam);
+				InstanceViewModel.FolderSettings.GetLayoutType(ColumnParams.NavPathParam);
 
 			// Add null check for ItemDisplayFrame
-			if (ItemDisplayFrame != null)
-			{
-				ItemDisplayFrame.Navigate(
-					typeof(ColumnLayoutPage),
-					new NavigationArguments()
-					{
-						IsSearchResultPage = ColumnParams.IsSearchResultPage,
-						SearchQuery = ColumnParams.SearchQuery,
-						NavPathParam = ColumnParams.NavPathParam,
-						SearchPathParam = ColumnParams.SearchPathParam,
-						AssociatedTabInstance = this,
-						SelectItems = ColumnParams.SelectItems
-					});
-			}
+			ItemDisplayFrame.Navigate(
+				typeof(ColumnLayoutPage),
+				new NavigationArguments()
+				{
+					IsSearchResultPage = ColumnParams.IsSearchResultPage,
+					SearchQuery = ColumnParams.SearchQuery,
+					NavPathParam = ColumnParams.NavPathParam,
+					SearchPathParam = ColumnParams.SearchPathParam,
+					AssociatedTabInstance = this,
+					SelectItems = ColumnParams.SelectItems
+				});
 		}
 
 		protected override void Page_Loaded(object sender, RoutedEventArgs e)
 		{
 			// Add null check for InstanceViewModel
-			if (InstanceViewModel?.FolderSettings != null)
-			{
-				ShellViewModel = new ShellViewModel(InstanceViewModel.FolderSettings);
-				ShellViewModel.WorkingDirectoryModified += ViewModel_WorkingDirectoryModified;
-				ShellViewModel.ItemLoadStatusChanged += FilesystemViewModel_ItemLoadStatusChanged;
-				ShellViewModel.DirectoryInfoUpdated += FilesystemViewModel_DirectoryInfoUpdated;
-				ShellViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
-				ShellViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
-				ShellViewModel.GitDirectoryUpdated += FilesystemViewModel_GitDirectoryUpdated;
-			}
+			ShellViewModel = new ShellViewModel(InstanceViewModel.FolderSettings);
+			ShellViewModel.WorkingDirectoryModified += ViewModel_WorkingDirectoryModified;
+			ShellViewModel.ItemLoadStatusChanged += FilesystemViewModel_ItemLoadStatusChanged;
+			ShellViewModel.DirectoryInfoUpdated += FilesystemViewModel_DirectoryInfoUpdated;
+			ShellViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
+			ShellViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
+			ShellViewModel.GitDirectoryUpdated += FilesystemViewModel_GitDirectoryUpdated;
 
 			PaneHolder = this.FindAscendant<ColumnsLayoutPage>()?.ParentShellPageInstance?.PaneHolder;
 
@@ -120,12 +114,12 @@ private void Page_Unloaded(object sender, RoutedEventArgs e)
 			}
 		}
 
-		protected override async void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e)
+		protected override async void ViewModel_WorkingDirectoryModified(object? sender, WorkingDirectoryModifiedEventArgs e)
 		{
 			// Add null check for e and e.Path
 			if (e == null) return;
 
-			string value = e.Path;
+			string? value = e.Path;
 			if (!string.IsNullOrWhiteSpace(value))
 				await UpdatePathUIToWorkingDirectoryAsync(value);
 		}
@@ -181,7 +175,7 @@ public override void Up_Click()
 			this.FindAscendant<ColumnsLayoutPage>()?.NavigateUp();
 		}
 
-		public override void NavigateToPath(string navigationPath, Type sourcePageType, NavigationArguments navArgs = null)
+		public override void NavigateToPath(string? navigationPath, Type? sourcePageType, NavigationArguments? navArgs = null)
 		{
 			if (string.IsNullOrEmpty(navigationPath))
 				return;
@@ -240,4 +234,4 @@ public override Task WhenIsCurrent()
 			return Task.WhenAll(_IsCurrentInstanceTCS.Task, parentTask ?? Task.CompletedTask);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Files.App/Views/Shells/ModernShellPage.xaml.cs b/src/Files.App/Views/Shells/ModernShellPage.xaml.cs
index 5aaa27a10b33..70386b012fec 100644
--- a/src/Files.App/Views/Shells/ModernShellPage.xaml.cs
+++ b/src/Files.App/Views/Shells/ModernShellPage.xaml.cs
@@ -18,8 +18,8 @@ protected override Frame ItemDisplay
 
 		private NavigationInteractionTracker _navigationInteractionTracker;
 
-		private NavigationParams _NavParams;
-		public NavigationParams NavParams
+		private NavigationParams? _NavParams;
+		public NavigationParams? NavParams
 		{
 			get => _NavParams;
 			set
@@ -54,7 +54,7 @@ public ModernShellPage() : base(new CurrentInstanceViewModel())
 			_navigationInteractionTracker.NavigationRequested += OverscrollNavigationRequested;
 		}
 
-		private async void ShellViewModel_FocusFilterHeader(object sender, EventArgs e)
+		private async void ShellViewModel_FocusFilterHeader(object? sender, EventArgs e)
 		{
 			// Delay to ensure the UI is ready for focus
 			await Task.Delay(100);
@@ -62,7 +62,7 @@ private async void ShellViewModel_FocusFilterHeader(object sender, EventArgs e)
 				FilterTextBox.Focus(FocusState.Programmatic);
 		}
 
-		private void ModernShellPage_RefreshWidgetsRequested(object sender, EventArgs e)
+		private void ModernShellPage_RefreshWidgetsRequested(object? sender, EventArgs e)
 		{
 			if (ItemDisplayFrame?.Content is HomePage currentPage)
 				currentPage.ViewModel.RefreshWidgetList();
@@ -90,37 +90,38 @@ protected override void ShellPage_NavigationRequested(object sender, PathNavigat
 
 		protected override void OnNavigationParamsChanged()
 		{
-			if (string.IsNullOrEmpty(NavParams?.NavPath) || NavParams.NavPath == "Home")
+			var navParams = NavParams;
+			if (string.IsNullOrEmpty(navParams?.NavPath) || navParams.NavPath == "Home")
 			{
 				NavigateHome();
 			}
-			else if (NavParams.NavPath == "ReleaseNotes")
+			else if (navParams.NavPath == "ReleaseNotes")
 			{
 				NavigateToReleaseNotes();
 			}
-			else if (NavParams.NavPath == "Settings")
+			else if (navParams.NavPath == "Settings")
 			{
-				NavigateToSettings(NavParams?.SelectItem);
+				NavigateToSettings(navParams.SelectItem);
 			}
 			else
 			{
-				var isTagSearch = NavParams.NavPath.StartsWith("tag:");
+				var isTagSearch = navParams.NavPath.StartsWith("tag:");
 
 				ItemDisplayFrame.Navigate(
-					InstanceViewModel.FolderSettings.GetLayoutType(NavParams.NavPath),
+					InstanceViewModel.FolderSettings.GetLayoutType(navParams.NavPath),
 					new NavigationArguments()
 					{
-						NavPathParam = NavParams.NavPath,
-						SelectItems = !string.IsNullOrWhiteSpace(NavParams?.SelectItem) ? new[] { NavParams.SelectItem } : null,
+						NavPathParam = navParams.NavPath,
+						SelectItems = !string.IsNullOrWhiteSpace(navParams.SelectItem) ? [navParams.SelectItem] : null,
 						IsSearchResultPage = isTagSearch,
 						SearchPathParam = isTagSearch ? "Home" : null,
-						SearchQuery = isTagSearch ? NavParams.NavPath : null,
+						SearchQuery = isTagSearch ? navParams.NavPath : null,
 						AssociatedTabInstance = this
 					});
 			}
 		}
 
-		protected override async void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e)
+		protected override async void ViewModel_WorkingDirectoryModified(object? sender, WorkingDirectoryModifiedEventArgs e)
 		{
 			if (e is null || string.IsNullOrWhiteSpace(e.Path))
 				return;
@@ -136,14 +137,14 @@ private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs
 			ContentPage = await GetContentOrNullAsync();
 
 			ToolbarViewModel.UpdateAdditionalActions();
-			if (ItemDisplayFrame.CurrentSourcePageType == (typeof(DetailsLayoutPage))
-				|| ItemDisplayFrame.CurrentSourcePageType == typeof(GridLayoutPage))
+			if (ItemDisplayFrame.CurrentSourcePageType == typeof(DetailsLayoutPage) ||
+				ItemDisplayFrame.CurrentSourcePageType == typeof(GridLayoutPage))
 			{
 				// Reset DataGrid Rows that may be in "cut" command mode
-				ContentPage.ResetItemOpacity();
+				ContentPage!.ResetItemOpacity();
 			}
 
-			var parameters = e.Parameter as NavigationArguments;
+			var parameters = (e.Parameter as NavigationArguments)!;
 			var isTagSearch = parameters.NavPathParam is not null && parameters.NavPathParam.StartsWith("tag:");
 			TabBarItemParameter = new()
 			{
@@ -157,7 +158,7 @@ private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs
 			// Update the ShellViewModel with the current working directory
 			// Fixes https://github.com/files-community/Files/issues/17469
 			if (parameters.IsSearchResultPage == false)
-				ShellViewModel.IsSearchResults = false;
+				ShellViewModel!.IsSearchResults = false;
 
 			_navigationInteractionTracker.CanNavigateBackward = CanNavigateBackward;
 			_navigationInteractionTracker.CanNavigateForward = CanNavigateForward;
@@ -288,7 +289,8 @@ public override void NavigateToSettings(string? selectItem = null)
 
 		public override void NavigateToPath(string? navigationPath, Type? sourcePageType, NavigationArguments? navArgs = null)
 		{
-			ShellViewModel.FilesAndFoldersFilter = null;
+			var shellViewModel = ShellViewModel!;
+			shellViewModel.FilesAndFoldersFilter = null;
 
 			if (sourcePageType is null && !string.IsNullOrEmpty(navigationPath))
 				sourcePageType = InstanceViewModel.FolderSettings.GetLayoutType(navigationPath);
@@ -303,9 +305,9 @@ public override void NavigateToPath(string? navigationPath, Type? sourcePageType
 			else
 			{
 				if ((string.IsNullOrEmpty(navigationPath) ||
-					string.IsNullOrEmpty(ShellViewModel?.WorkingDirectory) ||
+					string.IsNullOrEmpty(shellViewModel.WorkingDirectory) ||
 					navigationPath.TrimEnd(Path.DirectorySeparatorChar).Equals(
-						ShellViewModel.WorkingDirectory.TrimEnd(Path.DirectorySeparatorChar),
+						shellViewModel.WorkingDirectory.TrimEnd(Path.DirectorySeparatorChar),
 						StringComparison.OrdinalIgnoreCase)) &&
 					(TabBarItemParameter?.NavigationParameter is not string navArg ||
 					string.IsNullOrEmpty(navArg) ||
@@ -330,7 +332,7 @@ public override void NavigateToPath(string? navigationPath, Type? sourcePageType
 					new SuppressNavigationTransitionInfo());
 			}
 
-			ToolbarViewModel.PathControlDisplayText = ShellViewModel.WorkingDirectory;
+			ToolbarViewModel.PathControlDisplayText = shellViewModel.WorkingDirectory;
 		}
 
 		private void FilterTextBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
diff --git a/src/Files.Shared/Extensions/GenericExtensions.cs b/src/Files.Shared/Extensions/GenericExtensions.cs
index f251dd4d6e23..30b4ae7f0c74 100644
--- a/src/Files.Shared/Extensions/GenericExtensions.cs
+++ b/src/Files.Shared/Extensions/GenericExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Files.Shared.Extensions
@@ -13,5 +14,15 @@ public static class GenericExtensions
 
 			return defaultValue is not null ? defaultValue() : default;
 		}
+
+		public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
+			where T : class
+		{
+			foreach (var item in source)
+			{
+				if (item is not null)
+					yield return item;
+			}
+		}
 	}
 }
diff --git a/src/Files.Shared/Helpers/FileExtensionHelpers.cs b/src/Files.Shared/Helpers/FileExtensionHelpers.cs
index 528b5e14dd9a..be13970b0cbc 100644
--- a/src/Files.Shared/Helpers/FileExtensionHelpers.cs
+++ b/src/Files.Shared/Helpers/FileExtensionHelpers.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Frozen;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 
@@ -95,7 +96,7 @@ public static bool IsVideoFile(string? fileExtensionToCheck)
 		/// </summary>
 		/// <param name="fileExtensionToCheck">The file extension to check.</param>
 		/// <returns><c>true</c> if the fileExtensionToCheck is a PowerShell script; otherwise, <c>false</c>.</returns>
-		public static bool IsPowerShellFile(string fileExtensionToCheck)
+		public static bool IsPowerShellFile(string? fileExtensionToCheck)
 		{
 			return HasExtension(fileExtensionToCheck, ".ps1");
 		}
@@ -105,7 +106,7 @@ public static bool IsPowerShellFile(string fileExtensionToCheck)
 		/// </summary>
 		/// <param name="fileExtensionToCheck">The file extension to check.</param>
 		/// <returns><c>true</c> if the fileExtensionToCheck is a Batch file; otherwise, <c>false</c>.</returns>
-		public static bool IsBatchFile(string fileExtensionToCheck)
+		public static bool IsBatchFile(string? fileExtensionToCheck)
 		{
 			return HasExtension(fileExtensionToCheck, ".bat");
 		}
@@ -120,7 +121,7 @@ public static bool IsZipFile(string? fileExtensionToCheck)
 			return HasExtension(fileExtensionToCheck, ".zip", ".msix", ".appx", ".msixbundle", ".appxbundle", ".7z", ".rar", ".tar", ".mcpack", ".mcworld", ".mrpack", ".jar", ".gz", ".lzh");
 		}
 
-		public static bool IsBrowsableZipFile(string? filePath, out string? ext)
+		public static bool IsBrowsableZipFile(string? filePath, [NotNullWhen(true)] out string? ext)
 		{
 			if (string.IsNullOrWhiteSpace(filePath))
 			{
diff --git a/src/Satori.targets b/src/Satori.targets
index f0e6deec9ae4..3dc08c0991c0 100644
--- a/src/Satori.targets
+++ b/src/Satori.targets
@@ -39,8 +39,8 @@
   <Target Name="IncludeSatoriInRuntimePackAssets" AfterTargets="ExtractSatori" DependsOnTargets="ExtractSatori">
     <ItemGroup>
       <RuntimePackAsset Remove="@(RuntimePackAsset)"
-                        Condition=" ('%(RuntimePackAsset.Filename)' == 'coreclr' Or '%(RuntimePackAsset.Filename)' == 'clrjit') And '$(UseSatoriNativeRuntimeOverride)' == 'true'
-                                 Or ('%(RuntimePackAsset.Filename)' == 'System.Private.CoreLib' And '$(UseSatoriCoreLibOverride)' == 'true') " />
+                        Condition=" (('%(RuntimePackAsset.Filename)' == 'coreclr' Or '%(RuntimePackAsset.Filename)' == 'clrjit') And '$(UseSatoriNativeRuntimeOverride)' == 'true')
+                                 Or (('%(RuntimePackAsset.Filename)' == 'System.Private.CoreLib' And '$(UseSatoriCoreLibOverride)' == 'true')) " />
 
       <SatoriRuntimePackAsset Include="$(IntermediateOutputPath)Satori\System.Private.CoreLib.dll" Condition="'$(UseSatoriCoreLibOverride)' == 'true'">
         <AssetType>runtime</AssetType>