diff --git a/include/dfrn.php b/include/dfrn.php
index 877b529ba..9192e9430 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -216,13 +216,10 @@ class dfrn {
 			dbesc($sort)
 		);
 
-		if (!dbm::is_result($r)) {
-			/// @TODO Some logging?
-			killme();
-		}
-
-		// Will check further below if this actually returned results.
-		// We will provide an empty feed if that is the case.
+		/*
+		 * Will check further below if this actually returned results.
+		 * We will provide an empty feed if that is the case.
+		 */
 
 		$items = $r;
 
@@ -243,10 +240,10 @@ class dfrn {
 
 		$root = self::add_header($doc, $owner, $author, $alternatelink, true);
 
-		// This hook can't work anymore
+		/// @TODO This hook can't work anymore
 		//	call_hooks('atom_feed', $atom);
 
-		if (!count($items) OR $onlyheader) {
+		if (!dbm::is_result($items) OR $onlyheader) {
 			$atom = trim($doc->saveXML());
 
 			call_hooks('atom_feed_end', $atom);