diff --git a/Source/Game/Chat/Commands/TeleCommands.cs b/Source/Game/Chat/Commands/TeleCommands.cs
index 61a480018..08879479c 100644
--- a/Source/Game/Chat/Commands/TeleCommands.cs
+++ b/Source/Game/Chat/Commands/TeleCommands.cs
@@ -45,7 +45,7 @@ namespace Game.Chat
                 return false;
             }
 
-            if (me.IsInCombat())
+            if (me.IsInCombat() && !handler.GetSession().HasPermission(RBACPermissions.CommandTeleName))
             {
                 handler.SendSysMessage(CypherStrings.YouInCombat);
                 return false;
diff --git a/Source/Game/Combat/ThreatManager.cs b/Source/Game/Combat/ThreatManager.cs
index 4bed1dd06..a91aa4ee0 100644
--- a/Source/Game/Combat/ThreatManager.cs
+++ b/Source/Game/Combat/ThreatManager.cs
@@ -268,7 +268,7 @@ namespace Game.Combat
                     for (var i = 0; i < redirInfo.Count; ++i)
                     {
                         var pair = redirInfo[i]; // (victim,pct)
-                        Unit redirTarget = null;
+                        Unit redirTarget;
 
                         var refe = _myThreatListEntries.LookupByKey(pair.Item1); // try to look it up in our threat list first (faster)
                         if (refe != null)