diff --git a/src/apps/experimental/features/details/hooks/api/useGetItemByType.ts b/src/apps/experimental/features/details/hooks/api/useGetItemByType.ts
index 3cb2a9c716..c2966e97d4 100644
--- a/src/apps/experimental/features/details/hooks/api/useGetItemByType.ts
+++ b/src/apps/experimental/features/details/hooks/api/useGetItemByType.ts
@@ -13,8 +13,9 @@ const getItemByType = async (
     options?: AxiosRequestConfig
 ) => {
     const { api, user } = apiContext;
-    if (!api) throw new Error('No API instance available');
-    if (!user?.Id) throw new Error('No User ID provided');
+
+    if (!api) throw new Error('[getItemByType] No API instance available');
+    if (!user?.Id) throw new Error('[getItemByType] No User ID provided');
 
     let response;
     switch (itemType) {
diff --git a/src/hooks/api/libraryHooks/useGetDownload.ts b/src/hooks/api/libraryHooks/useGetDownload.ts
index 031e0e49b8..a57b7b4c01 100644
--- a/src/hooks/api/libraryHooks/useGetDownload.ts
+++ b/src/hooks/api/libraryHooks/useGetDownload.ts
@@ -10,29 +10,25 @@ const getDownload = async (
     options?: AxiosRequestConfig
 ) => {
     const { api, user } = apiContext;
-    if (!api) throw new Error('No API instance available');
-    if (!user?.Id) throw new Error('No User ID provided');
 
-    const response = await getLibraryApi(api).getDownload(
-        params,
-        options
-    );
+    if (!api) throw new Error('[getDownload] No API instance available');
+    if (!user?.Id) throw new Error('[getDownload] No User ID provided');
+
+    const response = await getLibraryApi(api).getDownload(params, options);
     return response.data;
 };
 
 export const getDownloadQuery = (
     apiContext: JellyfinApiContext,
     params: LibraryApiGetDownloadRequest
-) => queryOptions({
-    queryKey: ['Download', params.itemId],
-    queryFn: ({ signal }) =>
-        getDownload(apiContext, params, { signal }),
-    enabled: !!apiContext.api && !!apiContext.user?.Id && !!params.itemId
-});
+) =>
+    queryOptions({
+        queryKey: ['Download', params.itemId],
+        queryFn: ({ signal }) => getDownload(apiContext, params, { signal }),
+        enabled: !!apiContext.api && !!apiContext.user?.Id && !!params.itemId
+    });
 
-export const useGetDownload = (
-    params: LibraryApiGetDownloadRequest
-) => {
+export const useGetDownload = (params: LibraryApiGetDownloadRequest) => {
     const apiContext = useApi();
     return useQuery(getDownloadQuery(apiContext, params));
 };
diff --git a/src/hooks/api/liveTvHooks/useCancelSeriesTimer.ts b/src/hooks/api/liveTvHooks/useCancelSeriesTimer.ts
index 85c98b00e5..20747299ea 100644
--- a/src/hooks/api/liveTvHooks/useCancelSeriesTimer.ts
+++ b/src/hooks/api/liveTvHooks/useCancelSeriesTimer.ts
@@ -8,10 +8,11 @@ const cancelSeriesTimer = async (
     params: LiveTvApiCancelSeriesTimerRequest
 ) => {
     const { api } = apiContext;
-    if (api) {
-        const response = await getLiveTvApi(api).cancelSeriesTimer(params);
-        return response.data;
-    }
+
+    if (!api) throw new Error('[cancelSeriesTimer] No API instance available');
+
+    const response = await getLiveTvApi(api).cancelSeriesTimer(params);
+    return response.data;
 };
 
 export const useCancelSeriesTimer = () => {
diff --git a/src/hooks/api/liveTvHooks/useCancelTimer.ts b/src/hooks/api/liveTvHooks/useCancelTimer.ts
index 7ef8985cba..ed5b7846bf 100644
--- a/src/hooks/api/liveTvHooks/useCancelTimer.ts
+++ b/src/hooks/api/liveTvHooks/useCancelTimer.ts
@@ -8,10 +8,11 @@ const cancelTimer = async (
     params: LiveTvApiCancelTimerRequest
 ) => {
     const { api } = apiContext;
-    if (api) {
-        const response = await getLiveTvApi(api).cancelTimer(params);
-        return response.data;
-    }
+
+    if (!api) throw new Error('[cancelTimer] No API instance available');
+
+    const response = await getLiveTvApi(api).cancelTimer(params);
+    return response.data;
 };
 
 export const useCancelTimer = () => {
diff --git a/src/hooks/api/liveTvHooks/useGetChannel.ts b/src/hooks/api/liveTvHooks/useGetChannel.ts
index 93e241880c..53b119d485 100644
--- a/src/hooks/api/liveTvHooks/useGetChannel.ts
+++ b/src/hooks/api/liveTvHooks/useGetChannel.ts
@@ -10,8 +10,9 @@ const getChannel = async (
     options?: AxiosRequestConfig
 ) => {
     const { api, user } = apiContext;
-    if (!api) throw new Error('No API instance available');
-    if (!user?.Id) throw new Error('No User ID provided');
+
+    if (!api) throw new Error('[getChannel] No API instance available');
+    if (!user?.Id) throw new Error('[getChannel] No User ID provided');
 
     const response = await getLiveTvApi(api).getChannel(
         {
@@ -26,15 +27,15 @@ const getChannel = async (
 export const getChannelQuery = (
     apiContext: JellyfinApiContext,
     params: LiveTvApiGetChannelRequest
-) => queryOptions({
-    queryKey: ['Channel', params.channelId],
-    queryFn: ({ signal }) => getChannel(apiContext, params, { signal }),
-    enabled: !!apiContext.api && !!apiContext.user?.Id && !!params.channelId
-});
+) =>
+    queryOptions({
+        queryKey: ['Channel', params.channelId],
+        queryFn: ({ signal }) => getChannel(apiContext, params, { signal }),
+        enabled:
+            !!apiContext.api && !!apiContext.user?.Id && !!params.channelId
+    });
 
-export const useGetChannel = (
-    params: LiveTvApiGetChannelRequest
-) => {
+export const useGetChannel = (params: LiveTvApiGetChannelRequest) => {
     const apiContext = useApi();
     return useQuery(getChannelQuery(apiContext, params));
 };
diff --git a/src/hooks/api/liveTvHooks/useGetSeriesTimer.ts b/src/hooks/api/liveTvHooks/useGetSeriesTimer.ts
index d7342902a2..91e43baf72 100644
--- a/src/hooks/api/liveTvHooks/useGetSeriesTimer.ts
+++ b/src/hooks/api/liveTvHooks/useGetSeriesTimer.ts
@@ -10,25 +10,26 @@ const getSeriesTimer = async (
     options?: AxiosRequestConfig
 ) => {
     const { api } = apiContext;
-    if (!api) throw new Error('No API instance available');
-    const response = await getLiveTvApi(api).getSeriesTimer(
-        params,
-        options
-    );
 
+    if (!api) throw new Error('[getSeriesTimer] No API instance available');
+
+    const response = await getLiveTvApi(api).getSeriesTimer(params, options);
     return response.data;
 };
 
 export const getSeriesTimerQuery = (
     apiContext: JellyfinApiContext,
     params: LiveTvApiGetSeriesTimerRequest
-) => queryOptions({
-    queryKey: ['SeriesTimer', params.timerId],
-    queryFn: ({ signal }) => getSeriesTimer(apiContext, params, { signal }),
-    enabled: !!apiContext.api && !!apiContext.user?.Id && !!params.timerId
-});
+) =>
+    queryOptions({
+        queryKey: ['SeriesTimer', params.timerId],
+        queryFn: ({ signal }) => getSeriesTimer(apiContext, params, { signal }),
+        enabled: !!apiContext.api && !!apiContext.user?.Id && !!params.timerId
+    });
 
-export const useGetSeriesTimer = (requestParameters: LiveTvApiGetSeriesTimerRequest) => {
+export const useGetSeriesTimer = (
+    requestParameters: LiveTvApiGetSeriesTimerRequest
+) => {
     const apiContext = useApi();
     return useQuery(getSeriesTimerQuery(apiContext, requestParameters));
 };
diff --git a/src/hooks/api/liveTvHooks/useGetTimer.ts b/src/hooks/api/liveTvHooks/useGetTimer.ts
index f219dea059..f328ebfd7a 100644
--- a/src/hooks/api/liveTvHooks/useGetTimer.ts
+++ b/src/hooks/api/liveTvHooks/useGetTimer.ts
@@ -10,23 +10,22 @@ const getTimer = async (
     options?: AxiosRequestConfig
 ) => {
     const { api } = currentApi;
-    if (!api) throw new Error('No API instance available');
-    const response = await getLiveTvApi(api).getTimer(
-        params,
-        options
-    );
 
+    if (!api) throw new Error('[getTimer] No API instance available');
+
+    const response = await getLiveTvApi(api).getTimer(params, options);
     return response.data;
 };
 
 export const getTimerQuery = (
     apiContext: JellyfinApiContext,
     params: LiveTvApiGetTimerRequest
-) => queryOptions({
-    queryKey: ['Timer', params.timerId],
-    queryFn: ({ signal }) => getTimer(apiContext, params, { signal }),
-    enabled: !!apiContext.api && !!apiContext.user?.Id && !!params.timerId
-});
+) =>
+    queryOptions({
+        queryKey: ['Timer', params.timerId],
+        queryFn: ({ signal }) => getTimer(apiContext, params, { signal }),
+        enabled: !!apiContext.api && !!apiContext.user?.Id && !!params.timerId
+    });
 
 export const useGetTimer = (requestParameters: LiveTvApiGetTimerRequest) => {
     const apiContext = useApi();
diff --git a/src/hooks/api/videosHooks/useDeleteAlternateSources.ts b/src/hooks/api/videosHooks/useDeleteAlternateSources.ts
index c504c1bef9..6378a236a9 100644
--- a/src/hooks/api/videosHooks/useDeleteAlternateSources.ts
+++ b/src/hooks/api/videosHooks/useDeleteAlternateSources.ts
@@ -8,10 +8,11 @@ const deleteAlternateSources = async (
     params: VideosApiDeleteAlternateSourcesRequest
 ) => {
     const { api } = apiContext;
-    if (api) {
-        const response = await getVideosApi(api).deleteAlternateSources(params);
-        return response.data;
-    }
+
+    if (!api) throw new Error('[deleteAlternateSources] No API instance available');
+
+    const response = await getVideosApi(api).deleteAlternateSources(params);
+    return response.data;
 };
 
 export const useDeleteAlternateSources = () => {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index eed6dc6722..a707b0a3c8 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1045,8 +1045,8 @@
     "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
     "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
     "MessageBrowsePluginCatalog": "Browse our plugin catalog to view available plugins.",
-    "MessageCancelSeriesTimerError": "An error occurred while cancel series timer",
-    "MessageCancelTimerError": "An error occurred while cancel timer",
+    "MessageCancelSeriesTimerError": "An error occurred while canceling the series timer",
+    "MessageCancelTimerError": "An error occurred while canceling the timer",
     "MessageChangeRecordingPath": "Changing your recording folder will not migrate existing recordings from the old location to the new. You'll need to move them manually if desired.",
     "MessageConfirmAppExit": "Do you want to exit?",
     "MessageConfirmDeleteGuideProvider": "Are you sure you wish to delete this guide provider?",
@@ -1099,7 +1099,7 @@
     "MessageRenameMediaFolder": "Renaming a media library will cause all metadata to be lost, proceed with caution.",
     "MessageRepositoryInstallDisclaimer": "WARNING: Installing a third party plugin repository carries risks. It may contain unstable or malicious code, and may change at any time. Only install repositories from authors that you trust.",
     "MessageSent": "Message sent.",
-    "MessageSplitVersionsError": "An error occurred while split versions",
+    "MessageSplitVersionsError": "An error occurred while splitting versions",
     "MessageSyncPlayCreateGroupDenied": "Permission required to create a group.",
     "MessageSyncPlayDisabled": "SyncPlay disabled.",
     "MessageSyncPlayEnabled": "SyncPlay enabled.",