diff --git a/src/server.cpp b/src/server.cpp
index a868a0425..6a126b60d 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2627,6 +2627,10 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 			message += (wchar_t)readU16(buf);
 		}
 
+		// If something goes wrong, this player is to blame
+		RollbackScopeActor rollback_scope(m_rollback,
+				std::string("player:")+player->getName());
+
 		// Get player name of this client
 		std::wstring name = narrow_to_wide(player->getName());