diff --git a/src/jqLite.js b/src/jqLite.js
index 727218a94244..3923cf566376 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -809,7 +809,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 24920273e42f..6edb71a4f4ca 100644
--- a/test/jqLiteSpec.js
+++ b/test/jqLiteSpec.js
@@ -1301,6 +1301,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);
+    });
   });