diff --git a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
index 34b8d3b29..783211e9e 100644
--- a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
+++ b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
@@ -65,7 +65,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
 
         context.components.analytics.metrics.track(Event.ErrorPageVisited(improvedErrorType))
 
-        return RequestInterceptor.ErrorResponse(
+        return RequestInterceptor.ErrorResponse.Content(
             ErrorPages.createErrorPage(
                 context,
                 improvedErrorType,
diff --git a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt
index 08ebeb68e..7755d9290 100644
--- a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt
@@ -113,7 +113,9 @@ class AppRequestInterceptorTest {
     }
 
     private fun createActualErrorPage(error: ErrorType): String {
-        return interceptor.onErrorRequest(session = mockk(), errorType = error, uri = null)?.data!!
+        val errorPage = interceptor.onErrorRequest(session = mockk(), errorType = error, uri = null)
+                as RequestInterceptor.ErrorResponse.Content
+        return errorPage.data
     }
 
     private fun createExpectedErrorPage(error: ErrorType, @RawRes html: Int, @RawRes css: Int): String {