diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt
index 93cd4f390..b4436780a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
 
 import android.content.Context
 import android.net.Uri
+import com.crashlytics.android.Crashlytics
 import com.github.salomonbrys.kotson.*
 import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -13,6 +14,7 @@ import eu.kanade.tachiyomi.source.model.*
 import eu.kanade.tachiyomi.source.online.LewdSource
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.toast
 import exh.TSUMINO_SOURCE_ID
 import exh.ui.captcha.CaptchaCompletionVerifier
 import exh.ui.captcha.SolveCaptchaActivity
@@ -316,19 +318,24 @@ class Tsumino(private val context: Context): ParsedHttpSource(), LewdSource<Tsum
                 Page(index, chapter.url + "#${index + 1}", newImageUrl.toString())
             }
         }.doOnError {
-                    val aspNetCookie = preferences.eh_ts_aspNetCookie().getOrDefault()
+            try {
+                val aspNetCookie = preferences.eh_ts_aspNetCookie().getOrDefault()
 
-                    val cookiesMap = if(aspNetCookie.isNotBlank())
-                        mapOf(ASP_NET_COOKIE_NAME to aspNetCookie)
-                    else
-                        emptyMap()
+                val cookiesMap = if (aspNetCookie.isNotBlank())
+                    mapOf(ASP_NET_COOKIE_NAME to aspNetCookie)
+                else
+                    emptyMap()
 
-                    SolveCaptchaActivity.launch(context,
-                            this,
-                            cookiesMap,
-                            CAPTCHA_SCRIPT,
-                            "$BASE_URL/Read/Auth/$id")
-                }
+                SolveCaptchaActivity.launch(context,
+                        this,
+                        cookiesMap,
+                        CAPTCHA_SCRIPT,
+                        "$BASE_URL/Read/Auth/$id")
+            } catch(t: Throwable) {
+                Crashlytics.logException(t)
+                context.toast("Could not launch captcha-solving activity: ${t.message}")
+            }
+        }
     }
 
     override fun verify(url: String): Boolean {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
index 84a06d56e..fff19e16c 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@@ -67,9 +67,9 @@ class LibraryCategoryAdapter(val view: LibraryCategoryView) :
             }
 
             try {
-                val thisCache = globalSearchCache.getOrPut(view.category.name, {
+                val thisCache = globalSearchCache.getOrPut(view.category.name) {
                     SearchCache(mangas.size)
-                })
+                }
 
                 if(thisCache.ready) {
                     //Skip everything if cache matches our query exactly
diff --git a/app/src/main/java/exh/metadata/MetadataHelper.kt b/app/src/main/java/exh/metadata/MetadataHelper.kt
index 092a1d54f..11a25893d 100755
--- a/app/src/main/java/exh/metadata/MetadataHelper.kt
+++ b/app/src/main/java/exh/metadata/MetadataHelper.kt
@@ -31,17 +31,17 @@ fun Realm.queryMetadataFromManga(manga: Manga,
 fun Realm.syncMangaIds(mangas: List<LibraryItem>) {
     Timber.d("--> EH: Begin syncing ${mangas.size} manga IDs...")
     executeTransaction {
-        mangas.filter {
-            isLewdSource(it.manga.source)
-        }.forEach { manga ->
-            try {
-                manga.hasMetadata =
-                        queryMetadataFromManga(manga.manga).findFirst()?.let { meta ->
-                            meta.mangaId = manga.manga.id
-                            true
-                        } ?: false
-            } catch(e: Exception) {
-                Timber.w(e, "Error syncing manga IDs! Ignoring...")
+        mangas.forEach { manga ->
+            if(isLewdSource(manga.manga.source)) {
+                try {
+                    manga.hasMetadata =
+                            queryMetadataFromManga(manga.manga).findFirst()?.let { meta ->
+                                meta.mangaId = manga.manga.id
+                                true
+                            } ?: false
+                } catch (e: Exception) {
+                    Timber.w(e, "Error syncing manga IDs! Ignoring...")
+                }
             }
         }
     }