diff --git a/distributions/jamulus-server.service b/distributions/jamulus-server.service
index 82aec3c6..211d501f 100644
--- a/distributions/jamulus-server.service
+++ b/distributions/jamulus-server.service
@@ -8,7 +8,7 @@ Type=simple
 Restart=always
 RestartSec=1
 User=jamulus
-ExecStart=/bin/bash -c '/usr/bin/jamulus -s -n --servername $(uname -n) -l /var/log/jamulus -e jamulus.fischvolk.de -g -w "Connected..." -o "$(uname -n);;;"'
+ExecStart=/bin/bash -c '/usr/bin/jamulus -s -n --servername $(uname -n) -l /var/log/jamulus -e jamulus.fischvolk.de -g -o "$(uname -n);;"'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/src/historygraph.cpp b/src/historygraph.cpp
index 96f00aad..9c3522f3 100644
--- a/src/historygraph.cpp
+++ b/src/historygraph.cpp
@@ -335,8 +335,8 @@ CJpegHistoryGraph::CJpegHistoryGraph() :
     }
     // if all else fails, it's left at -1
 
-    QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() );
-    tsConsoleStream << "CJpegHistoryGraph" << endl; // on console
+//    QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() );
+//    tsConsoleStream << "CJpegHistoryGraph" << endl; // on console
 
 
     // Connections -------------------------------------------------------------
@@ -411,8 +411,8 @@ CSvgHistoryGraph::CSvgHistoryGraph() :
     svgRootAttributes.append ( "xmlns", "http://www.w3.org/2000/svg" );
     svgRootAttributes.append ( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
 
-    QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() );
-    tsConsoleStream << "CSvgHistoryGraph" << endl; // on console
+//    QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() );
+//    tsConsoleStream << "CSvgHistoryGraph" << endl; // on console
 
 
     // Connections -------------------------------------------------------------
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index d7298d62..44d94b91 100755
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -85,7 +85,8 @@ CServerListManager::CServerListManager ( const quint16  iNPortNum,
 
         // [this server country as QLocale ID]
         const int iCountry = slServInfoSeparateParams[2].toInt();
-        if ( ( iCountry >= 0 ) && ( iCountry <= QLocale::LastCountry ) )
+
+        if ( !slServInfoSeparateParams[2].isEmpty() && ( iCountry >= 0 ) && ( iCountry <= QLocale::LastCountry ) )
         {
             ThisServerListEntry.eCountry = static_cast<QLocale::Country> (
                 iCountry );