diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index 7520c4ebfd..6f2af53011 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -18,8 +18,21 @@
 NetworkSyncManager::NetworkSyncManager(int argc, char **argv)
 {
     NetPlayerClient = new EzSockets;
-    if (argc > 1)
-        Connect(argv[1],8765);
+	m_ServerVersion = 0;
+
+    if (argc > 2)
+        if (Connect(argv[1],8765) == true)
+		{
+			useSMserver = true;
+			int ClientCommand=3;
+			NetPlayerClient->send((char*) &ClientCommand, 4);
+			NetPlayerClient->receive(m_ServerVersion);
+				//If network play is desired
+				//AND the connection works
+				//Halt until we know what server 
+				//version we're dealing with
+		} else
+			useSMserver = false;
     else
         useSMserver = false;
 }
diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h
index 2bbbf560ee..4395515fbe 100644
--- a/stepmania/src/NetworkSyncManager.h
+++ b/stepmania/src/NetworkSyncManager.h
@@ -34,6 +34,8 @@ private:
 	int m_combo;
     bool useSMserver;
     EzSockets *NetPlayerClient;
+
+	int m_ServerVersion; //ServerVersion
     
     struct netHolder		//Data structure used for sending data to server
     {