diff --git a/src/main.cpp b/src/main.cpp
index a4a9ca16a0..e50ec57dd1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -650,6 +650,13 @@ int main ( int argc, char** argv )
             exit ( 1 );
         }
 
+        if ( ServerOnlyOptions.contains ( "--serverinfo" ) && strServerInfo.split ( ";" ).count() < 3 )
+        {
+            qWarning() << qUtf8Printable (
+                QString ( "\"--serverinfo '%1'\": must contain [name];[city];[country] - value will be ignored" ).arg ( strServerInfo ) );
+            strServerInfo = "";
+        }
+
 #ifndef HEADLESS
         if ( bUseGUI )
         {
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 52888bdd33..484373adc8 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -232,10 +232,6 @@ CServerListManager::CServerListManager ( const quint16  iNPortNum,
                                         .arg ( slServInfoSeparateParams[2] )
                                         .arg ( QLocale::countryToString ( ThisServerListEntry.eCountry ) ) );
     }
-    else
-    {
-        qWarning() << "Ignoring invalid serverinfo, please verify the parameter syntax.";
-    }
 
     // per definition, the very first entry is this server and this entry will
     // never be deleted