diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 6a39178ce..bdd09a1a8 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -181,13 +181,15 @@ namespace MWMechanics
         // get or create temporary storage
         AiCombatStorage& storage = state.get<AiCombatStorage>();
         
+        const MWWorld::Class& actorClass = actor.getClass();
 
         
         //General description
-        if(actor.getClass().getCreatureStats(actor).isDead())
+        if (actorClass.getCreatureStats(actor).isDead())
             return true;
 
-        MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        MWWorld::Ptr target = world->searchPtrViaActorId(mTargetActorId);
         if (target.isEmpty())
             return false;
 
@@ -196,9 +198,6 @@ namespace MWMechanics
                 || target.getClass().getCreatureStats(target).isDead())
             return true;
 
-        const MWWorld::Class& actorClass = actor.getClass();
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-
 
         //Update every frame
         bool& combatMove = storage.mCombatMove;