Merge branch 'master' into 'v0.1.9'

# Conflicts:
#   src/server/mods/event-xmas/maps/tutorial/events/xmas.js

src/server/world/atlas.js

@@ -110,8 +110,13 @@ define([
 
 		send: function (zone, msg) {
 			var thread = this.getThreadFromId(zone);
-			if (thread)
-				thread.worker.send(msg);
+			if (thread) {
+				try {
+					thread.worker.send(msg);
+				} catch (e) {
+					console.log(msg);
+				}
+			}
 		},
 
 		getThreadFromId: function (id) {