diff --git a/apps/openmw-mp/Cell.cpp b/apps/openmw-mp/Cell.cpp
index 79d6fc98c..0e060b080 100644
--- a/apps/openmw-mp/Cell.cpp
+++ b/apps/openmw-mp/Cell.cpp
@@ -32,16 +32,16 @@ void Cell::removePlayer(Player *player)
     }
 }
 
-Cell::TPlayers Cell::getPlayers()
+Cell::TPlayers Cell::getPlayers() const
 {
     return players;
 }
 
-void Cell::sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent)
+void Cell::sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent) const
 {
     std::list <Player*> plList;
 
-    for (auto pl :getPlayers())
+    for (auto pl : players)
         plList.push_back(pl);
 
     plList.sort();
@@ -73,6 +73,7 @@ CellController *CellController::sThis = nullptr;
 
 void CellController::create()
 {
+    assert(!sThis);
     sThis = new CellController;
 }
 
@@ -85,6 +86,7 @@ void CellController::destroy()
 
 CellController *CellController::get()
 {
+    assert(sThis);
     return sThis;
 }
 
diff --git a/apps/openmw-mp/Cell.hpp b/apps/openmw-mp/Cell.hpp
index 5ddeddbb4..26eb26bc6 100644
--- a/apps/openmw-mp/Cell.hpp
+++ b/apps/openmw-mp/Cell.hpp
@@ -61,8 +61,8 @@ public:
     void addPlayer(Player *player);
     void removePlayer(Player *player);
 
-    TPlayers getPlayers();
-    void sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent);
+    TPlayers getPlayers() const;
+    void sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent) const;
 
     std::string getDescription() const;