diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 8ba71a12c..de37cfce6 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -580,11 +580,13 @@ public:
     static bool HandleNpcSetFactionTempIdCommand(ChatHandler* handler, const char* args)
     {
         Player* me = handler->GetSession()->GetPlayer();
-        Creature* creature = me->GetSelectedUnit()->ToCreature();
+        Unit* SelectedCreature = me->GetSelectedUnit();
 
-        if (!me)
+        if (!SelectedCreature)
             return false;
 
+        Creature* creature = SelectedCreature->ToCreature();
+
         if (!creature)
             return false;
 
@@ -598,7 +600,7 @@ public:
     }
 
     //set orginal faction for npc
-    static bool HandleNpcSetOriginalFaction(ChatHandler* handler, const char* args)
+    static bool HandleNpcSetOriginalFaction(ChatHandler* handler, const char* /*args*/)
     {
         Player* me = handler->GetSession()->GetPlayer();
         Creature* creature = me->GetSelectedUnit()->ToCreature();