diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
index 7c2acf4e..7a759cd6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
@@ -28,12 +28,12 @@ class CloudflareKiller : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response = runBlocking {
         val request = chain.request()
         if (savedCookies[request.url.host] == null) {
-            bypassCloudflare(request).also {
-                debugWarning({ it == null }) { "Failed cloudflare at: ${request.url}" }
-            }?.let {
+            bypassCloudflare(request)?.let {
+                Log.d(TAG, "Succeeded bypassing cloudflare: ${request.url}")
                 return@runBlocking it
             }
         }
+        debugWarning({ true }) { "Failed cloudflare at: ${request.url}" }
         return@runBlocking chain.proceed(request)
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
index 651f104b..538b96f8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
@@ -82,12 +82,15 @@ class WebViewResolver(
         val headers = request.headers
         println("Initial web-view request: $url")
         var webView: WebView? = null
+        // Extra assurance it exits as it should.
+        var shouldExit = false
 
         fun destroyWebView() {
             main {
                 webView?.stopLoading()
                 webView?.destroy()
                 webView = null
+                shouldExit = true
                 println("Destroyed webview")
             }
         }
@@ -234,7 +237,7 @@ class WebViewResolver(
         val delayTime = 100L
 
         // A bit sloppy, but couldn't find a better way
-        while (loop < totalTime / delayTime) {
+        while (loop < totalTime / delayTime && !shouldExit) {
             if (fixedRequest != null) return fixedRequest to extraRequestList
             delay(delayTime)
             loop += 1
@@ -242,7 +245,7 @@ class WebViewResolver(
 
         println("Web-view timeout after ${totalTime / 1000}s")
         destroyWebView()
-        return null to extraRequestList
+        return fixedRequest to extraRequestList
     }
 
 }