Index: binary-improvements2/MapRendering/src/ModApi.cs
===================================================================
--- binary-improvements2/MapRendering/src/ModApi.cs	(revision 405)
+++ binary-improvements2/MapRendering/src/ModApi.cs	(revision 406)
@@ -7,7 +7,9 @@
 	public class ModApi : IModApi {
 		public void InitMod (Mod _modInstance) {
-			ModEvents.GameShutdown.RegisterHandler (GameShutdown);
-			ModEvents.CalcChunkColorsDone.RegisterHandler (CalcChunkColorsDone);
-
+			if (ConnectionManager.Instance.IsServer) {
+				ModEvents.GameShutdown.RegisterHandler (GameShutdown);
+				ModEvents.CalcChunkColorsDone.RegisterHandler (CalcChunkColorsDone);
+			}
+			
 			Web.ServerInitialized += _web => {
 				_web.RegisterPathHandler ("/map/", new StaticHandler (