diff --git a/include/functions.php b/include/functions.php
index 0148d069d..43138a1f9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1851,6 +1851,8 @@
 			}
 			break;
 		}
+
+		return false;
 	}
 
 	function getFeedTitle($link, $id, $cat = false) {
diff --git a/js/FeedTree.js b/js/FeedTree.js
index bb50d6fbb..fbddb708f 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -100,7 +100,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 	_createTreeNode: function(args) {
 		var tnode = new dijit._TreeNode(args);
 
-		if (args.item.icon)
+		if (args.item.icon && args.item.icon[0])
 			tnode.iconNode.src = args.item.icon[0];
 
 		var id = args.item.id[0];