diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java b/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java
index 50aab278f4..94f36ec705 100644
--- a/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java
+++ b/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java
@@ -253,7 +253,6 @@ public class DatabaseHelper {
                 .filter(c -> !dbChapters.contains(c))
                 .doOnNext(c -> {
                     c.manga_id = manga.id;
-                    c.date_fetch = new Date().getTime();
                     ChapterRecognition.parseChapterNumber(c, manga);
                 })
                 .toList();
diff --git a/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadManager.java b/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadManager.java
index 95db355258..40a1917158 100644
--- a/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadManager.java
+++ b/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadManager.java
@@ -164,7 +164,7 @@ public class DownloadManager {
 
     // Check that all the images are downloaded
     private boolean isChapterDownloaded(File directory, List<Page> pages) {
-        return pages != null && pages.size() + 1 == directory.listFiles().length;
+        return pages != null && !pages.isEmpty() && pages.size() + 1 == directory.listFiles().length;
     }
 
     // Download the entire chapter
@@ -359,9 +359,9 @@ public class DownloadManager {
     public File getAbsoluteChapterDirectory(Source source, Manga manga, Chapter chapter) {
         String chapterRelativePath = source.getName() +
                 File.separator +
-                manga.title.replaceAll("[^a-zA-Z0-9.-]", "_") +
+                manga.title.replaceAll("[^\\sa-zA-Z0-9.-]", "_") +
                 File.separator +
-                chapter.name.replaceAll("[^a-zA-Z0-9.-]", "_");
+                chapter.name.replaceAll("[^\\sa-zA-Z0-9.-]", "_") + " (" + chapter.id + ")";
 
         return new File(preferences.getDownloadsDirectory(), chapterRelativePath);
     }
diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/base/Source.java b/app/src/main/java/eu/kanade/mangafeed/data/source/base/Source.java
index fd669d3c00..08475b6469 100644
--- a/app/src/main/java/eu/kanade/mangafeed/data/source/base/Source.java
+++ b/app/src/main/java/eu/kanade/mangafeed/data/source/base/Source.java
@@ -105,7 +105,9 @@ public abstract class Source extends BaseSource {
                 .getStringResponse(getBaseUrl() + overrideChapterUrl(chapterUrl), requestHeaders, null)
                 .flatMap(unparsedHtml -> {
                     List<Page> pages = convertToPages(parseHtmlToPageUrls(unparsedHtml));
-                    return Observable.just(parseFirstPage(pages, unparsedHtml));
+                    return !pages.isEmpty() ?
+                            Observable.just(parseFirstPage(pages, unparsedHtml)) :
+                            Observable.error(new Exception("Page list is empty"));
                 });
     }
 
diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Kissmanga.java b/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Kissmanga.java
index 73851cba7b..2cf4a982b5 100644
--- a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Kissmanga.java
+++ b/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Kissmanga.java
@@ -203,7 +203,9 @@ public class Kissmanga extends Source {
                 .flatMap(networkService::mapResponseToString)
                 .flatMap(unparsedHtml -> {
                     List<Page> pages = convertToPages(parseHtmlToPageUrls(unparsedHtml));
-                    return Observable.just(parseFirstPage(pages, unparsedHtml));
+                    return !pages.isEmpty() ?
+                            Observable.just(parseFirstPage(pages, unparsedHtml)) :
+                            Observable.error(new Exception("Page list is empty"));
                 });
     }