diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 244fb1f84671ac61de286ea06ea8441f2e0b4b07..74be03d8031e4957d32ffe82b37d8f811be1126d 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -160,19 +160,21 @@ class FeedItem_Atom extends FeedItem_Common {
 
 			$content = $this->xpath->query("media:content", $enclosure)->item(0);
 
-			$enc->type = $content->getAttribute("type");
-			$enc->link = $content->getAttribute("url");
-			$enc->length = $content->getAttribute("length");
-
-			$desc = $this->xpath->query("media:description", $content)->item(0);
-			if ($desc) {
-				$enc->title = strip_tags($desc->nodeValue);
-			} else {
-				$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-				if ($desc) $enc->title = strip_tags($desc->nodeValue);
-			}
+			if ($content) {
+				$enc->type = $content->getAttribute("type");
+				$enc->link = $content->getAttribute("url");
+				$enc->length = $content->getAttribute("length");
+
+				$desc = $this->xpath->query("media:description", $content)->item(0);
+				if ($desc) {
+					$enc->title = strip_tags($desc->nodeValue);
+				} else {
+					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
+					if ($desc) $enc->title = strip_tags($desc->nodeValue);
+				}
 
-			array_push($encs, $enc);
+				array_push($encs, $enc);
+			}
 		}
 
 		$enclosures = $this->xpath->query("media:thumbnail", $this->elem);
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 7d445a6c348d1f79aac6d8ca9bced1076933a12f..28f4a388d648a8bd43a7a145c9438c939eddb23a 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -140,19 +140,21 @@ class FeedItem_RSS extends FeedItem_Common {
 
 			$content = $this->xpath->query("media:content", $enclosure)->item(0);
 
-			$enc->type = $content->getAttribute("type");
-			$enc->link = $content->getAttribute("url");
-			$enc->length = $content->getAttribute("length");
-
-			$desc = $this->xpath->query("media:description", $content)->item(0);
-			if ($desc) {
-				$enc->title = strip_tags($desc->nodeValue);
-			} else {
-				$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-				if ($desc) $enc->title = strip_tags($desc->nodeValue);
+			if ($content) {
+				$enc->type = $content->getAttribute("type");
+				$enc->link = $content->getAttribute("url");
+				$enc->length = $content->getAttribute("length");
+
+				$desc = $this->xpath->query("media:description", $content)->item(0);
+				if ($desc) {
+					$enc->title = strip_tags($desc->nodeValue);
+				} else {
+					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
+					if ($desc) $enc->title = strip_tags($desc->nodeValue);
+				}
+
+				array_push($encs, $enc);
 			}
-
-			array_push($encs, $enc);
 		}
 
 		$enclosures = $this->xpath->query("media:thumbnail", $this->elem);