1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs
index b4ad90168..4e2a475d9 100644
--- a/MediaBrowser.Common/Extensions/BaseExtensions.cs
+++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs
@@ -62,7 +62,12 @@ namespace MediaBrowser.Common.Extensions
         /// <exception cref="System.ArgumentNullException">attrib</exception>
         public static string GetAttributeValue(this string str, string attrib)
         {
-            if (attrib == null)
+            if (string.IsNullOrEmpty(str))
+            {
+                throw new ArgumentNullException("str");
+            }
+
+            if (string.IsNullOrEmpty(attrib))
             {
                 throw new ArgumentNullException("attrib");
             }