Index: trunk/src/game/GameObject.cpp
===================================================================
--- trunk/src/game/GameObject.cpp (revision 145)
+++ trunk/src/game/GameObject.cpp (revision 146)
@@ -1272,8 +1272,14 @@
     if(!trigger) return;
 
-    Unit *owner = GetOwner();
-    if(owner) trigger->setFaction(owner->getFaction());
-    else trigger->setFaction(14);
     trigger->SetVisibility(VISIBILITY_OFF); //should this be true?
-    trigger->CastSpell(target, spell, true, 0, 0, owner->GetGUID());
-}
+    if(Unit *owner = GetOwner())
+    {
+        trigger->setFaction(owner->getFaction());
+        trigger->CastSpell(target, spell, true, 0, 0, owner->GetGUID());
+    }
+    else
+    {
+        trigger->setFaction(14);
+        trigger->CastSpell(target, spell, true);
+    }
+}