diff --git a/Modules/Sources/WordPressCore/ApiCache.swift b/Modules/Sources/WordPressCore/ApiCache.swift
index e3425c42d226..c77da9ecdb51 100644
--- a/Modules/Sources/WordPressCore/ApiCache.swift
+++ b/Modules/Sources/WordPressCore/ApiCache.swift
@@ -2,6 +2,7 @@ import Foundation
 import WordPressAPI
 import WordPressAPIInternal
 import WordPressApiCache
+import WordPressShared
 
 extension WordPressApiCache {
     static func bootstrap() -> WordPressApiCache {
@@ -10,8 +11,6 @@ extension WordPressApiCache {
         return instance
     }
 
-    // TODO:
-    // - Log errors to sentry: https://github.com/wordpress-mobile/WordPress-iOS/pull/25157#discussion_r2785458461
     private static func onDiskCache() -> WordPressApiCache? {
         let cacheURL = URL.libraryDirectory.appending(path: "app.sqlite")
 
@@ -27,7 +26,7 @@ extension WordPressApiCache {
                     return cache
                 }
             } catch {
-                NSLog("Failed to delete sqlite database: \(error)")
+                wpAssertionFailure("Failed to delete sqlite database")
             }
         }
 
@@ -39,14 +38,14 @@ extension WordPressApiCache {
         do {
             cache = try WordPressApiCache(url: file)
         } catch {
-            NSLog("Failed to create an instance: \(error)")
+            wpAssertionFailure("Failed to create an instance")
             return nil
         }
 
         do {
             _ = try cache.performMigrations()
         } catch {
-            NSLog("Failed to migrate database: \(error)")
+            wpAssertionFailure("Failed to migrate database")
             return nil
         }
 
@@ -56,7 +55,7 @@ extension WordPressApiCache {
             values.isExcludedFromBackup = true
             try url.setResourceValues(values)
         } catch {
-            NSLog("Failed exclude the database file from iCloud backup: \(error)")
+            wpAssertionFailure("Failed exclude the database file from iCloud backup")
         }
 
         return cache
diff --git a/WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostTypesView.swift b/WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostTypesView.swift
index 09ca6766a2b5..72c46d35f90a 100644
--- a/WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostTypesView.swift
+++ b/WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostTypesView.swift
@@ -4,6 +4,7 @@ import WordPressCore
 import WordPressData
 import WordPressAPI
 import WordPressAPIInternal
+import WordPressShared
 import WordPressUI
 
 struct CustomPostTypesView: View {
@@ -106,6 +107,8 @@ struct CustomPostTypesView: View {
         return NavigationLink {
             if let wpService = service.wpService {
                 CustomPostTabView(client: service.client, service: wpService, endpoint: details.toPostEndpointType(), details: details, blog: blog)
+            } else {
+                let _ = wpAssertionFailure("Expected wpService to be available")
             }
         } label: {
             HStack {