diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 6d9f53831..2480e329e 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -751,7 +751,7 @@ namespace MWMechanics
     {
         for (std::map<CreatureStats::SummonKey, int>::iterator it = mSummonedCreatures.begin(); it != mSummonedCreatures.end(); )
         {
-            if (Misc::StringUtils::ciEqual(getSummonedCreature(it->first.first), refId))
+            if (Misc::StringUtils::ciEqual(getSummonedCreature(it->first.first), refId) && it->second == -1)
             {
                 it->second = actorId;
                 break;
diff --git a/components/openmw-mp/Base/BasePacketProcessor.hpp b/components/openmw-mp/Base/BasePacketProcessor.hpp
index 634de91e2..6020afc22 100644
--- a/components/openmw-mp/Base/BasePacketProcessor.hpp
+++ b/components/openmw-mp/Base/BasePacketProcessor.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <memory>
 #include <unordered_map>
+#include <stdexcept>
 
 #define BPP_INIT(packet_id) packetID = packet_id; strPacketID = #packet_id; className = typeid(this).name(); avoidReading = false;