diff --git a/src/lib/components/Reader/MangaPage.svelte b/src/lib/components/Reader/MangaPage.svelte
index 569bd64..c0216e9 100644
--- a/src/lib/components/Reader/MangaPage.svelte
+++ b/src/lib/components/Reader/MangaPage.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
   import type { Page } from '$lib/types';
-  import { onMount } from 'svelte';
   import TextBoxes from './TextBoxes.svelte';
 
   export let page: Page;
   export let src: File;
 
-  $: url = `url(${URL.createObjectURL(src)})`;
+  $: url = src ? `url(${URL.createObjectURL(src)})` : '';
 </script>
 
 <div
diff --git a/src/lib/components/Settings/CatalogSettings.svelte b/src/lib/components/Settings/CatalogSettings.svelte
index 025fc8c..e5b82a6 100644
--- a/src/lib/components/Settings/CatalogSettings.svelte
+++ b/src/lib/components/Settings/CatalogSettings.svelte
@@ -2,13 +2,17 @@
   import { AccordionItem, Button } from 'flowbite-svelte';
   import { db } from '$lib/catalog/db';
   import { promptConfirmation } from '$lib/util';
+  import { goto } from '$app/navigation';
 
   function onClear() {
     promptConfirmation('Are you sure you want to clear your catalog?', () => db.catalog.clear());
+    goto('/');
   }
 </script>
 
 <AccordionItem>
   <span slot="header">Catalog settings</span>
-  <Button on:click={onClear} outline color="red">Clear catalog</Button>
+  <div class="flex flex-col">
+    <Button on:click={onClear} outline color="red">Clear catalog</Button>
+  </div>
 </AccordionItem>
diff --git a/src/lib/upload/index.ts b/src/lib/upload/index.ts
index 9ffa4e2..d0cfef8 100644
--- a/src/lib/upload/index.ts
+++ b/src/lib/upload/index.ts
@@ -64,16 +64,24 @@ export async function scanFiles(item: FileSystemEntry, files: Promise<File | und
   if (item.isDirectory) {
     const directoryReader = (item as FileSystemDirectoryEntry).createReader();
     await new Promise<void>((resolve) => {
-      directoryReader.readEntries(async (entries) => {
-        for (const entry of entries) {
-          if (entry.isFile) {
-            files.push(getFile(entry as FileSystemFileEntry));
+      function readEntries() {
+        directoryReader.readEntries(async (entries) => {
+          if (entries.length > 0) {
+            for (const entry of entries) {
+              if (entry.isFile) {
+                files.push(getFile(entry as FileSystemFileEntry));
+              } else {
+                await scanFiles(entry, files);
+              }
+            }
+            readEntries()
           } else {
-            await scanFiles(entry, files);
+            resolve();
           }
-        }
-        resolve();
-      });
+        });
+      }
+
+      readEntries()
     });
   }
 }
@@ -187,5 +195,7 @@ export async function processFiles(files: File[]) {
 
       showSnackbar('Catalog updated successfully');
     }
+  } else {
+    showSnackbar('Missing .mokuro file');
   }
 }