diff --git a/src/jqLite.js b/src/jqLite.js
index 218efe244be1..e7531fb36379 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -822,7 +822,11 @@ forEach({
   },
 
   find: function(element, selector) {
-    return element.getElementsByTagName(selector);
+    if (element.getElementsByTagName) {
+      return element.getElementsByTagName(selector);
+    } else {
+      return [];
+    }
   },
 
   clone: jqLiteClone,
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js
index 02a17df81679..09be1c1cb436 100644
--- a/test/jqLiteSpec.js
+++ b/test/jqLiteSpec.js
@@ -1335,6 +1335,12 @@ describe('jqLite', function() {
       expect(innerDiv.length).toEqual(1);
       expect(innerDiv.html()).toEqual('text');
     });
+
+    it('should find child by name and not care about text nodes', function() {
+      var divs = jqLite('<div><span>aa</span></div>text<div><span>bb</span></div>');
+      var innerSpan = divs.find('span');
+      expect(innerSpan.length).toEqual(2);
+    });
   });