diff --git a/src/selector.js b/src/selector.js
index dd050659..ecec83b9 100644
--- a/src/selector.js
+++ b/src/selector.js
@@ -333,8 +333,9 @@ var Expr = Sizzle.selectors = {
 			}
 		},
 		NAME: function(match, context, isXML){
-			if ( typeof context.getElementsByName !== "undefined" && !isXML ) {
-				return context.getElementsByName(match[1]);
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = context.getElementsByName(match[1]);
+				return ret.length === 0 ? null : ret;
 			}
 		},
 		TAG: function(match, context){
diff --git a/test/index.html b/test/index.html
index 2c3545f0..c415d11c 100644
--- a/test/index.html
+++ b/test/index.html
@@ -121,8 +121,8 @@
 			<input name="types[]" id="types_movie" type="checkbox" value="movie" />
 		</form>
 		
-		<div id="fx-queue">
-			<div id="fadein" class='chain test'>fadeIn<div>fadeIn</div></div>
+		<div id="fx-queue" name="test">
+			<div id="fadein" class='chain test' name='div'>fadeIn<div>fadeIn</div></div>
 			<div id="fadeout" class='chain test out'>fadeOut<div>fadeOut</div></div>
 			
 			<div id="show" class='chain test'>show<div>show</div></div>
diff --git a/test/unit/selector.js b/test/unit/selector.js
index 715823a6..9be93832 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -134,12 +134,14 @@ test("class", function() {
 });
 
 test("name", function() {
-	expect(7);
+	expect(9);
 
 	t( "Name selector", "input[name=action]", ["text1"] );
 	t( "Name selector with single quotes", "input[name='action']", ["text1"] );
 	t( "Name selector with double quotes", 'input[name="action"]', ["text1"] );
 
+	t( "Name selector non-input", "[name=test]", ["length", "fx-queue"] );
+	t( "Name selector non-input", "[name=div]", ["fadein"] );
 	t( "Name selector non-input", "*[name=iframe]", ["iframe"] );
 
 	t( "Name selector for grouped input", "input[name='types[]']", ["types_all", "types_anime", "types_movie"] )