diff --git a/src/backend/server/api.ts b/src/backend/server/api.ts
index 58802357..2f133027 100644
--- a/src/backend/server/api.ts
+++ b/src/backend/server/api.ts
@@ -505,7 +505,7 @@ Note: this is only supported by some components.`
             pMap(res.data, async (x) => await queueFunc(x), {concurrency: 5});
             more = res.data.length === res.meta.limit;
             if(more) {
-                currentFilters.offset! += res.meta.limit
+                currentFilters.offset = (currentFilters.offset ?? 0) + res.meta.limit
             }
         }
     });
diff --git a/src/backend/server/auth.ts b/src/backend/server/auth.ts
index 1e85a49f..26524d06 100644
--- a/src/backend/server/auth.ts
+++ b/src/backend/server/auth.ts
@@ -100,13 +100,15 @@ export const setupAuthRoutes = (app: Express, router: ReturnType<typeof createTy
         } else if(req.url.includes('ytmusic')) {
             const entity: YTMusicSource | undefined = scrobbleSources.getByName(name) as (YTMusicSource | undefined);
             if(entity === undefined) {
-                logger.error(`No YTMUsic source with name ${state} was found`);
+                logger.error(`No YTMUsic source with name ${name} was found`);
+                res.status(404).send(`No YTMusic source with name ${name} was found`);
+                return;
             }
-            const result = await entity!.handleAuthCodeCallback(req.query as Record<string, any>);
+            const result = await entity.handleAuthCodeCallback(req.query as Record<string, any>);
             let responseContent = 'OK';
             if(result === true) {
-                entity!.authFailure = false;
-                entity!.poll().catch((e) => logger.error(e));
+                entity.authFailure = false;
+                entity.poll().catch((e) => logger.error(e));
             } else {
                 responseContent = result;
             }