diff --git a/src/Clients/Muinshee/Muinshee.csproj b/src/Clients/Muinshee/Muinshee.csproj
index e4d17c9..b788fea 100644
--- a/src/Clients/Muinshee/Muinshee.csproj
+++ b/src/Clients/Muinshee/Muinshee.csproj
@@ -49,17 +49,11 @@
     <Reference Include="gtk-sharp">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="gtk-sharp">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
     <Reference Include="Mono.Cairo">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..bin\Mono.Cairo.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="gdk-sharp">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
     <Reference Include="dbus-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
diff --git a/src/Core/Banshee.Core/Resources/translators.xml b/src/Core/Banshee.Core/Resources/translators.xml
index bba99bb..32a47cc 100644
--- a/src/Core/Banshee.Core/Resources/translators.xml
+++ b/src/Core/Banshee.Core/Resources/translators.xml
@@ -35,10 +35,11 @@
     <person>Joe Hansen</person>
     <person>Lasse Bang Mikkelsen</person>
   </language>
-  <language code="de" name="Deutsch">
+  <language code="de" name="">
     <person>Andre Klapper</person>
     <person>Christian Kirbach</person>
     <person>Daniel Schindler</person>
+    <person>Hendrik Knackstedt</person>
     <person>Jochen Skulj</person>
     <person>Mario Blättermann</person>
     <person>Micha Pietsch</person>
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
index e11d927..97a1c59 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
@@ -203,8 +203,10 @@ namespace Banshee.Daap
         {
             long length;
             Stream stream = database.StreamTrack(song, offset, out length);
-            WriteResponseStream(client, stream, length, song.FileName, offset < 0 ? 0 : offset);
-            stream.Close();
+            if (stream != null) {
+                WriteResponseStream(client, stream, length, song.FileName, offset < 0 ? 0 : offset);
+                stream.Close();
+            }
             client.Close();
         }
 
diff --git a/src/Extensions/Banshee.Daap/Daap/Database.cs b/src/Extensions/Banshee.Daap/Daap/Database.cs
index 0c4dd11..19ec218 100644
--- a/src/Extensions/Banshee.Daap/Daap/Database.cs
+++ b/src/Extensions/Banshee.Daap/Daap/Database.cs
@@ -420,6 +420,11 @@ namespace Daap {
         public Stream StreamTrack (int track_id, string track_format, long offset, out long length)
         {
             HttpWebResponse response = FetchTrack (track_id, track_format, offset);
+            if (response.StatusCode != HttpStatusCode.OK) {
+                length = 0;
+                response.Close();
+                return null;
+            }
             length = response.ContentLength;
             return response.GetResponseStream ();
         }
