6 files changed, 11 insertions, 7 deletions
diff --git a/Jellyfin.Api/Helpers/AudioHelper.cs b/Jellyfin.Api/Helpers/AudioHelper.cs
index c6d577b19..21ec2d32f 100644
--- a/Jellyfin.Api/Helpers/AudioHelper.cs
+++ b/Jellyfin.Api/Helpers/AudioHelper.cs
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Api.Models.StreamingDtos;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
@@ -101,7 +102,7 @@ namespace Jellyfin.Api.Helpers
         {
             if (_httpContextAccessor.HttpContext == null)
             {
-                throw new NullReferenceException(nameof(_httpContextAccessor.HttpContext));
+                throw new ResourceNotFoundException(nameof(_httpContextAccessor.HttpContext));
             }
 
             bool isHeadRequest = _httpContextAccessor.HttpContext.Request.Method == System.Net.WebRequestMethods.Http.Head;
diff --git a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
index 20bca731f..e7fac50c6 100644
--- a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
+++ b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
@@ -132,7 +132,7 @@ namespace Jellyfin.Api.Helpers
         {
             if (_httpContextAccessor.HttpContext == null)
             {
-                throw new NullReferenceException(nameof(_httpContextAccessor.HttpContext));
+                throw new ResourceNotFoundException(nameof(_httpContextAccessor.HttpContext));
             }
 
             using var state = await StreamingHelpers.GetStreamingState(
diff --git a/Jellyfin.Api/Helpers/HlsHelpers.cs b/Jellyfin.Api/Helpers/HlsHelpers.cs
index 16fbac7ae..707d1cd10 100644
--- a/Jellyfin.Api/Helpers/HlsHelpers.cs
+++ b/Jellyfin.Api/Helpers/HlsHelpers.cs
@@ -3,6 +3,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
 
@@ -47,7 +48,7 @@ namespace Jellyfin.Api.Helpers
                             var line = await reader.ReadLineAsync().ConfigureAwait(false);
                             if (line == null)
                             {
-                                throw new NullReferenceException(nameof(line));
+                                throw new ResourceNotFoundException(nameof(line));
                             }
 
                             if (line.IndexOf("#EXTINF:", StringComparison.OrdinalIgnoreCase) != -1)
diff --git a/Jellyfin.Api/Helpers/ProgressiveFileCopier.cs b/Jellyfin.Api/Helpers/ProgressiveFileCopier.cs
index 65c03c710..8bddf00d5 100644
--- a/Jellyfin.Api/Helpers/ProgressiveFileCopier.cs
+++ b/Jellyfin.Api/Helpers/ProgressiveFileCopier.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Api.Models.PlaybackDtos;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.IO;
 
@@ -92,7 +93,7 @@ namespace Jellyfin.Api.Helpers
 
                 if (_path == null)
                 {
-                    throw new NullReferenceException(nameof(_path));
+                    throw new ResourceNotFoundException(nameof(_path));
                 }
 
                 await using var inputStream = new FileStream(_path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, IODefaults.FileStreamBufferSize, fileOptions);
diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs
index 1d102071c..04b107727 100644
--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs
+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs
@@ -85,7 +85,7 @@ namespace Jellyfin.Api.Helpers
             streamingRequest.StreamOptions = ParseStreamOptions(httpRequest.Query);
             if (httpRequest.Path.Value == null)
             {
-                throw new NullReferenceException(nameof(httpRequest.Path));
+                throw new ResourceNotFoundException(nameof(httpRequest.Path));
             }
 
             var url = httpRequest.Path.Value.Split('.').Last();
diff --git a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
index b72e33af3..4ec0c576a 100644
--- a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
+++ b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
@@ -12,6 +12,7 @@ using Jellyfin.Api.Models.PlaybackDtos;
 using Jellyfin.Api.Models.StreamingDtos;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
@@ -198,7 +199,7 @@ namespace Jellyfin.Api.Helpers
             var job = (TranscodingJobDto?)state;
             if (job == null)
             {
-                throw new NullReferenceException(nameof(job));
+                throw new ResourceNotFoundException(nameof(job));
             }
 
             if (!job.HasExited && job.Type != TranscodingJobType.Progressive)
@@ -496,7 +497,7 @@ namespace Jellyfin.Api.Helpers
             var directory = Path.GetDirectoryName(outputPath);
             if (directory == null)
             {
-                throw new NullReferenceException(nameof(directory));
+                throw new ResourceNotFoundException(nameof(directory));
             }
 
             Directory.CreateDirectory(directory);