diff --git a/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift b/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift
index e8f242a56..2205bde5f 100644
--- a/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift
+++ b/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift
@@ -29,14 +29,14 @@ class HTMLFeedFinder {
 			}
 		}
 
-		if let bodyLinks = RSHTMLLinkParser.htmlLinks(with: parserData) {
-			for oneBodyLink in bodyLinks {
+		let bodyLinks = RSHTMLLinkParser.htmlLinks(with: parserData)
 
-				if linkMightBeFeed(oneBodyLink) {
-					let normalizedURL = oneBodyLink.urlString.normalizedURL
-					let oneFeedSpecifier = FeedSpecifier(title: oneBodyLink.text, urlString: normalizedURL, source: .HTMLLink)
-					addFeedSpecifier(oneFeedSpecifier)
-				}
+		for oneBodyLink in bodyLinks {
+
+			if linkMightBeFeed(oneBodyLink) {
+				guard let normalizedURL = oneBodyLink.urlString?.normalizedURL else { continue }
+				let oneFeedSpecifier = FeedSpecifier(title: oneBodyLink.text, urlString: normalizedURL, source: .HTMLLink)
+				addFeedSpecifier(oneFeedSpecifier)
 			}
 		}
 	}
diff --git a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
index 2a4c72266..f09a50f98 100644
--- a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
+++ b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
@@ -1061,7 +1061,7 @@ private extension FeedbinAccountDelegate {
 		
 		let parsedItems: [ParsedItem] = entries.map { entry in
 			let authors = Set([ParsedAuthor(name: entry.authorName, url: entry.jsonFeed?.jsonFeedAuthor?.url, avatarURL: entry.jsonFeed?.jsonFeedAuthor?.avatarURL, emailAddress: nil)])
-			return ParsedItem(syncServiceID: String(entry.articleID), uniqueID: String(entry.articleID), feedURL: String(entry.feedID), url: entry.url, externalURL: nil, title: entry.title, contentHTML: entry.contentHTML, contentText: nil, summary: entry.summary, imageURL: nil, bannerImageURL: nil, datePublished: entry.parsedDatePublished, dateModified: nil, authors: authors, tags: nil, attachments: nil)
+			return ParsedItem(syncServiceID: String(entry.articleID), uniqueID: String(entry.articleID), feedURL: String(entry.feedID), url: entry.url, externalURL: nil, title: entry.title, language: nil, contentHTML: entry.contentHTML, contentText: nil, summary: entry.summary, imageURL: nil, bannerImageURL: nil, datePublished: entry.parsedDatePublished, dateModified: nil, authors: authors, tags: nil, attachments: nil)
 		}
 		
 		return Set(parsedItems)
diff --git a/Shared/Images/RSHTMLMetadata+Extension.swift b/Shared/Images/RSHTMLMetadata+Extension.swift
index a9b57438e..a15d6651a 100644
--- a/Shared/Images/RSHTMLMetadata+Extension.swift
+++ b/Shared/Images/RSHTMLMetadata+Extension.swift
@@ -13,7 +13,9 @@ extension RSHTMLMetadata {
 
 	func largestOpenGraphImageURL() -> String? {
 
-		guard let openGraphImages = openGraphProperties?.images, !openGraphImages.isEmpty else {
+		let openGraphImages = openGraphProperties.images
+		
+		guard !openGraphImages.isEmpty else {
 			return nil
 		}
 
@@ -44,7 +46,9 @@ extension RSHTMLMetadata {
 
 	func largestAppleTouchIcon() -> String? {
 
-		guard let icons = appleTouchIcons, !icons.isEmpty else {
+		let icons = appleTouchIcons
+
+		guard !icons.isEmpty else {
 			return nil
 		}
 
diff --git a/submodules/RSParser b/submodules/RSParser
index 81c400a76..fcbd9a34e 160000
--- a/submodules/RSParser
+++ b/submodules/RSParser
@@ -1 +1 @@
-Subproject commit 81c400a7665309a08414bf43ca5161d90d072501
+Subproject commit fcbd9a34ecd8c080c6f26798a4b22ea0c98d8e74