diff --git a/Frameworks/ArticlesDatabase/ArticlesTable.swift b/Frameworks/ArticlesDatabase/ArticlesTable.swift
index 3ac4de861..a92354045 100644
--- a/Frameworks/ArticlesDatabase/ArticlesTable.swift
+++ b/Frameworks/ArticlesDatabase/ArticlesTable.swift
@@ -475,16 +475,15 @@ private extension ArticlesTable {
 	func makeDatabaseArticles(with resultSet: FMResultSet) -> Set<DatabaseArticle> {
 		let articles = resultSet.mapToSet { (row) -> DatabaseArticle? in
 
-			// The resultSet is a result of a JOIN query with the statuses table,
-			// so we can get the statuses at the same time and avoid additional database lookups.
-
-			guard let status = statusesTable.statusWithRow(resultSet) else {
-				assertionFailure("Expected status.")
+			guard let articleID = row.string(forColumn: DatabaseKey.articleID) else {
+				assertionFailure("Expected articleID.")
 				return nil
 			}
 
-			guard let articleID = row.string(forColumn: DatabaseKey.articleID) else {
-				assertionFailure("Expected articleID.")
+			// The resultSet is a result of a JOIN query with the statuses table,
+			// so we can get the statuses at the same time and avoid additional database lookups.
+			guard let status = statusesTable.statusWithRow(resultSet, articleID: articleID) else {
+				assertionFailure("Expected status.")
 				return nil
 			}
 			guard let feedID = row.string(forColumn: DatabaseKey.feedID) else {
diff --git a/Frameworks/ArticlesDatabase/StatusesTable.swift b/Frameworks/ArticlesDatabase/StatusesTable.swift
index 0bb18377d..fa5a741ab 100644
--- a/Frameworks/ArticlesDatabase/StatusesTable.swift
+++ b/Frameworks/ArticlesDatabase/StatusesTable.swift
@@ -105,17 +105,21 @@ final class StatusesTable: DatabaseTable {
 		guard let articleID = row.string(forColumn: DatabaseKey.articleID) else {
 			return nil
 		}
+		return statusWithRow(row, articleID: articleID)
+	}
+
+	func statusWithRow(_ row: FMResultSet, articleID: String) ->ArticleStatus? {
 		if let cachedStatus = cache[articleID] {
 			return cachedStatus
 		}
-		
+
 		guard let dateArrived = row.date(forColumn: DatabaseKey.dateArrived) else {
 			return nil
 		}
 
 		let articleStatus = ArticleStatus(articleID: articleID, dateArrived: dateArrived, row: row)
 		cache.addStatusIfNotCached(articleStatus)
-		
+
 		return articleStatus
 	}