diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 4a6b2df5..d8d20943 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -471,8 +471,11 @@ namespace TShockAPI
                         NetMessage.buffer[e.remoteClient].writeBuffer = stream.GetBuffer();
                         try
                         {
-                            NetMessage.buffer[e.remoteClient].spamCount++;
-                            Netplay.serverSock[e.remoteClient].networkStream.BeginWrite(NetMessage.buffer[e.remoteClient].writeBuffer, 0, (int)stream.Length, new AsyncCallback(Netplay.serverSock[e.remoteClient].ServerWriteCallBack), Netplay.serverSock[e.remoteClient].networkStream);
+                            if (Netplay.serverSock[e.remoteClient].tcpClient.Connected)
+                            {
+                                NetMessage.buffer[e.remoteClient].spamCount++;
+                                Netplay.serverSock[e.remoteClient].networkStream.BeginWrite(NetMessage.buffer[e.remoteClient].writeBuffer, 0, (int)stream.Length, new AsyncCallback(Netplay.serverSock[e.remoteClient].ServerWriteCallBack), Netplay.serverSock[e.remoteClient].networkStream);
+                            }
                         }
                         catch { }
                         NetMessage.buffer[e.remoteClient].writeLocked = false;
@@ -503,6 +506,7 @@ namespace TShockAPI
             if (Config.AlwaysPvP)
             {
                 player.SetPvP(true);
+                player.SendMessage("PvP is forced! Enable PvP else you can't deal damage to other people. (People can kill you)", Color.Red);
             }
             if (player.Group.HasPermission("causeevents") && Config.InfiniteInvasion)
             {