8 files changed, 4 insertions, 7 deletions
diff --git a/src/bots.cpp b/src/bots.cpp
index 6389ac2cd..4114d4317 100644
--- a/src/bots.cpp
+++ b/src/bots.cpp
@@ -50,7 +50,7 @@ BotInfo::BotInfo(const std::string &nnick, const std::string &nuser, const std::
 		BotListByUID[this->uid] = this;
 
 	// If we're synchronised with the uplink already, call introduce_user() for this bot.
-	if (Me && Me->GetUplink()->IsSynced())
+	if (Me && Me->GetUplink() && Me->GetUplink()->IsSynced())
 	{
 		ircdproto->SendClientIntroduction(this->nick, this->GetIdent(), this->host, this->realname, ircd->pseudoclient_mode, this->uid);
 		XLine x(this->nick.c_str(), "Reserved for services");
diff --git a/src/init.cpp b/src/init.cpp
index b0f019ad3..6ea0cab35 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -318,6 +318,9 @@ int init_primary(int ac, char **av)
 	/* Add IRCD Protocol Module; exit if there are errors */
 	if (protocol_module_init())
 		return -1;
+	
+	/* Create me */
+	Me = new Server(NULL, Config.ServerName, 0, Config.ServerDesc, (Config.Numeric ? Config.Numeric : ""));
 
 	/* First thing, add our core bots internally. Before modules are loaded and before the database is read
 	 * This is used for modules adding commands and for the BotInfo* poiners in the command classes.
diff --git a/src/protocol/bahamut.cpp b/src/protocol/bahamut.cpp
index 5b84deb73..d7849c940 100644
--- a/src/protocol/bahamut.cpp
+++ b/src/protocol/bahamut.cpp
@@ -279,7 +279,6 @@ class BahamutIRCdProto : public IRCDProto
 
 	void SendConnect()
 	{
-		Me = new Server(NULL, Config.ServerName, 0, Config.ServerDesc, "");
 		bahamut_cmd_pass(uplink_server->password);
 		bahamut_cmd_capab();
 		SendServer(Me);
diff --git a/src/protocol/inspircd11.cpp b/src/protocol/inspircd11.cpp
index 89b2daa32..66c9ffabc 100644
--- a/src/protocol/inspircd11.cpp
+++ b/src/protocol/inspircd11.cpp
@@ -239,7 +239,6 @@ class InspIRCdProto : public IRCDProto
 
 	void SendConnect()
 	{
-		Me = new Server(NULL, Config.ServerName, 0, Config.ServerDesc, "");
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(NULL, "BURST");
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 76105eba4..49197e9ae 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -240,7 +240,6 @@ class InspIRCdProto : public IRCDProto
 
 	void SendConnect()
 	{
-		Me = new Server(NULL, Config.ServerName, 0, Config.ServerDesc, TS6SID);
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(TS6SID, "BURST");
diff --git a/src/protocol/inspircd20.cpp b/src/protocol/inspircd20.cpp
index 48c0d6d4b..f74a045fc 100644
--- a/src/protocol/inspircd20.cpp
+++ b/src/protocol/inspircd20.cpp
@@ -241,7 +241,6 @@ class InspIRCdProto : public IRCDProto
 		send_cmd(NULL, "CAPAB START 1202");
 		send_cmd(NULL, "CAPAB CAPABILITIES :PROTOCOL=1202");
 		send_cmd(NULL, "CAPAB END");
-		Me = new Server(NULL, Config.ServerName, 0, Config.ServerDesc, TS6SID);
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(TS6SID, "BURST");
diff --git a/src/protocol/ratbox.cpp b/src/protocol/ratbox.cpp
index 33a3baceb..80065222d 100644
--- a/src/protocol/ratbox.cpp
+++ b/src/protocol/ratbox.cpp
@@ -189,7 +189,6 @@ class RatboxProto : public IRCDTS6Proto
 
 	void SendConnect()
 	{
-		Me = new Server(NULL, Config.ServerName, 0, Config.ServerDesc, TS6SID);
 		ratbox_cmd_pass(uplink_server->password);
 		ratbox_cmd_capab();
 		/* Make myself known to myself in the serverlist */
diff --git a/src/protocol/unreal32.cpp b/src/protocol/unreal32.cpp
index d5c2a6072..0cfb0512e 100644
--- a/src/protocol/unreal32.cpp
+++ b/src/protocol/unreal32.cpp
@@ -276,7 +276,6 @@ class UnrealIRCdProto : public IRCDProto
 
 	void SendConnect()
 	{
-		Me = new Server(NULL, Config.ServerName, 0, Config.ServerDesc, (Config.Numeric ? Config.Numeric : ""));
 		unreal_cmd_capab();
 		unreal_cmd_pass(uplink_server->password);
 		SendServer(Me);