1 files changed, 2 insertions, 7 deletions
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
index f77a2875e10..6336174eece 100755
--- a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
@@ -276,10 +276,7 @@ namespace System.Xml
 				if (current == null)
 					return String.Empty;
 
-				if (current.NodeType == XmlNodeType.Attribute)
-					return current.Prefix != String.Empty ? current.Prefix : null;
-				else
-					return current.Prefix;
+				return current.Prefix;
 			}
 		}
 
@@ -784,10 +781,8 @@ namespace System.Xml
 			}
 
 			if (current.NodeType == XmlNodeType.Attribute) {
-				if (current.FirstChild == null)
-					return false;
 				current = current.FirstChild;
-				return true;
+				return current != null;
 			} else if (current.ParentNode.NodeType == XmlNodeType.Attribute) {
 				if (current.NextSibling == null)
 					return false;