diff --git a/src/mpdclient.cpp b/src/mpdclient.cpp
index d05a06f..413ac44 100644
--- a/src/mpdclient.cpp
+++ b/src/mpdclient.cpp
@@ -114,13 +114,22 @@ bool CMpdClient::GetCurrentSong()
 
       if (line == "OK")
       {
-        if (artist.empty())
-          artist = "Unknown artist";
+        string songtext;
+        if (artist.empty() && title.empty())
+        {
+          songtext = "Wat? No title?";
+        }
+        else
+        {
+          if (artist.empty())
+            artist = "Unknown artist";
+          if (title.empty())
+            title = "Unknown title";
 
-        if (title.empty())
-          title = "Unknown title";
+          songtext = artist + " - " + title;
+        }
 
-        SetCurrentSong(artist + " - " + title);
+        SetCurrentSong(songtext);
         return true;
       }
     }