diff --git a/SWYH/Properties/AssemblyInfo.cs b/SWYH/Properties/AssemblyInfo.cs
index d1290cc..c9f5d8d 100644
--- a/SWYH/Properties/AssemblyInfo.cs
+++ b/SWYH/Properties/AssemblyInfo.cs
@@ -35,7 +35,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sebastien.warin.fr")]
 [assembly: AssemblyProduct("Stream What You Hear (SWYH)")]
-[assembly: AssemblyCopyright("Copyright ©  2012 - 2015 Sebastien.warin.fr")]
+[assembly: AssemblyCopyright("Copyright ©  2012-2016 Sebastien.warin.fr")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -75,5 +75,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.15316.0")] // MAJOR.minor.BuildDate.Release (Si Release impaire = BETA) || http://www.epochconverter.com/epoch/daynumbers.php
+[assembly: AssemblyFileVersion("1.4.16069.0")] // MAJOR.minor.BuildDate.Release (Si Release impaire = BETA) || http://www.epochconverter.com/epoch/daynumbers.php
 [assembly: GuidAttribute("2ecd245f-4268-48ee-b0f1-0706ead1ba42")]
diff --git a/SWYH/UPnP/SwyhDevice.cs b/SWYH/UPnP/SwyhDevice.cs
index 34da33f..d5c880e 100644
--- a/SWYH/UPnP/SwyhDevice.cs
+++ b/SWYH/UPnP/SwyhDevice.cs
@@ -176,9 +176,12 @@ private void PageHandler(OpenSource.UPnP.UPnPDevice sender, OpenSource.UPnP.HTTP
             {
                 WebSession.OnStreamDone += (s, e) =>
                 {
-                    PipeStream value;
-                    while (!sessionMp3Streams.TryRemove(s.SessionID, out value)) ; ;
-                    App.CurrentInstance.wasapiProvider.UpdateClientsList();
+                    if (sessionMp3Streams.ContainsKey(s.SessionID))
+                    {
+                        PipeStream value;
+                        sessionMp3Streams.TryRemove(s.SessionID, out value);
+                        App.CurrentInstance.wasapiProvider.UpdateClientsList();
+                    }
                 };
                 PipeStream stream = sessionMp3Streams.GetOrAdd(WebSession.SessionID, new PipeStream());
                 App.CurrentInstance.wasapiProvider.UpdateClientsList();
@@ -188,9 +191,12 @@ private void PageHandler(OpenSource.UPnP.UPnPDevice sender, OpenSource.UPnP.HTTP
             {
                 WebSession.OnStreamDone += (s, e) =>
                 {
-                    PipeStream value;
-                    while (!sessionPcmStreams.TryRemove(s.SessionID, out value)) ; ;
-                    App.CurrentInstance.wasapiProvider.UpdateClientsList();
+                    if (sessionPcmStreams.ContainsKey(s.SessionID))
+                    {
+                        PipeStream value;
+                        sessionPcmStreams.TryRemove(s.SessionID, out value);
+                        App.CurrentInstance.wasapiProvider.UpdateClientsList();
+                    }
                 };
                 PipeStream stream = sessionPcmStreams.GetOrAdd(WebSession.SessionID, new PipeStream());
                 App.CurrentInstance.wasapiProvider.UpdateClientsList();