diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
index c210857a..0962fec6 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
@@ -139,6 +139,7 @@ class ServerWorld private constructor(
 			}
 
 			clients.forEach {
+				LOGGER.info("Kicking ${it.client.alias()} off dying world")
 				it.remove("World shutting down", setReturnWarp = false)
 				it.client.enqueueWarp(WarpAlias.Return)
 			}
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
index bd78dc68..c9c72ed0 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
@@ -338,10 +338,10 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 					it.tick(delta)
 			} catch (err: Throwable) {
 				if (it.isRemote && isServer) {
-					LOGGER.error("Exception ticking client spawned entity $it, removing", err)
+					LOGGER.error("Exception ticking client owned entity $it, removing", err)
 					it.remove(AbstractEntity.RemovalReason.REMOVED)
 				} else {
-					LOGGER.error("Exception ticking entity $it", err)
+					throw err
 				}
 			}
 		}