2 files changed, 6 insertions, 0 deletions
diff --git a/src/commands.cpp b/src/commands.cpp
index 5466a6258..916c9bc10 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2631,6 +2631,7 @@ void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char
 			}
 		}
 	}
+	log(DEBUG,"Done with netsplit.");
 }
 
 unsigned long authcookie;
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index c0603db59..712e26f5e 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2913,6 +2913,11 @@ int InspIRCd(char** argv, int argc)
 		                        strlcpy(tcp_msg,msg.c_str(),MAXBUF);
 					if (me[x])
 						handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum);
+					if (!me[x]->FindHost(tcp_host))
+					{
+						log(DEBUG,"Connector gone, bailing!");
+						goto label;
+					}
 				}
                 		        sums.clear();	// we're done, clear the list for the next operation
 		                        msgs.clear();