diff --git a/ClassicalSharp/2D/Screens/ErrorScreen.cs b/ClassicalSharp/2D/Screens/DisconnectScreen.cs
similarity index 97%
rename from ClassicalSharp/2D/Screens/ErrorScreen.cs
rename to ClassicalSharp/2D/Screens/DisconnectScreen.cs
index 13712a27c..7969c3e09 100644
--- a/ClassicalSharp/2D/Screens/ErrorScreen.cs
+++ b/ClassicalSharp/2D/Screens/DisconnectScreen.cs
@@ -5,7 +5,7 @@ using ClassicalSharp.Gui.Widgets;
 using OpenTK.Input;
 
 namespace ClassicalSharp.Gui.Screens {
-	public class ErrorScreen : ClickableScreen {
+	public class DisconnectScreen : ClickableScreen {
 		
 		string title, message;
 		readonly Font titleFont, messageFont;
@@ -13,7 +13,7 @@ namespace ClassicalSharp.Gui.Screens {
 		DateTime initTime, clearTime;
 		bool canReconnect;
 		
-		public ErrorScreen(Game game, string title, string message) : base(game) {
+		public DisconnectScreen(Game game, string title, string message) : base(game) {
 			this.title = title;
 			this.message = message;
 			
diff --git a/ClassicalSharp/ClassicalSharp.csproj b/ClassicalSharp/ClassicalSharp.csproj
index 351cee072..3d59a7bd7 100644
--- a/ClassicalSharp/ClassicalSharp.csproj
+++ b/ClassicalSharp/ClassicalSharp.csproj
@@ -89,7 +89,7 @@
     <Compile Include="2D\Screens\ChatScreen.cs" />
     <Compile Include="2D\Screens\ClickableScreen.cs" />
     <Compile Include="2D\Screens\DeathScreen.cs" />
-    <Compile Include="2D\Screens\ErrorScreen.cs" />
+    <Compile Include="2D\Screens\DisconnectScreen.cs" />
     <Compile Include="2D\Screens\FpsScreen.cs" />
     <Compile Include="2D\Screens\Inventory\InventoryScreen.cs" />
     <Compile Include="2D\Screens\Inventory\InventoryScreen.Input.cs" />
diff --git a/ClassicalSharp/Game/ChatLog.cs b/ClassicalSharp/Game/ChatLog.cs
index 175338310..ba4ae9725 100644
--- a/ClassicalSharp/Game/ChatLog.cs
+++ b/ClassicalSharp/Game/ChatLog.cs
@@ -43,11 +43,7 @@ namespace ClassicalSharp {
 		
 		static char[] trimChars = new char[] { ' ', '\0' };
 		StringBuffer logBuffer = new StringBuffer(128);
-		public void Add(string text) {
-			Log.Add(text);
-			LogChatToFile(text);
-			game.Events.RaiseChatReceived(text, MessageType.Normal);
-		}
+		public void Add(string text) { Add(text, MessageType.Normal); }
 		
 		public void Add(string text, MessageType type) {
 			if (type == MessageType.Normal) {
diff --git a/ClassicalSharp/Game/Game.cs b/ClassicalSharp/Game/Game.cs
index fa17d52f9..56976e506 100644
--- a/ClassicalSharp/Game/Game.cs
+++ b/ClassicalSharp/Game/Game.cs
@@ -267,7 +267,7 @@ namespace ClassicalSharp {
 			Drawer2D.InitColours();
 			BlockInfo.Reset(this);
 			TexturePack.ExtractDefault(this);
-			Gui.SetNewScreen(new ErrorScreen(this, title, reason));
+			Gui.SetNewScreen(new DisconnectScreen(this, title, reason));
 			GC.Collect();
 		}