diff --git a/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs b/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
index 0b0d22e..e08b700 100644
--- a/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
+++ b/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
@@ -67,8 +67,13 @@ namespace Banshee.Streaming
         private static string Choose (string priority, string fallback, bool flip)
         {
             return flip 
-                ? String.IsNullOrEmpty (fallback) ? priority : fallback
-                : String.IsNullOrEmpty (priority) ? fallback : priority;
+                ? IsNullOrEmpty (fallback) ? priority : fallback
+                : IsNullOrEmpty (priority) ? fallback : priority;
+        }
+
+        private static bool IsNullOrEmpty (string s)
+        {
+            return String.IsNullOrEmpty (s) || s.Trim ('\0').Length == 0;
         }
 
         #pragma warning disable 0169
