diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index 6fafbf823e..7a3a151467 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -321,7 +321,7 @@ void BattlefieldWG::UpdateCounterVehicle(bool init)
 void BattlefieldWG::OnBattleEnd(bool endbytimer)
 {
     // Remove relic
-    if (m_relic)
+    if (m_relic && m_relic->isSpawned())
         m_relic->RemoveFromWorld();
     m_relic = NULL;
 
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h
index e46bf2b7e5..b5f4ffe8ad 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
@@ -1607,7 +1607,7 @@ struct WGWorkshop
 
     WGWorkshop(BattlefieldWG* _bf, uint8 _workshopId)
     {
-        ASSERT(bf);
+        ASSERT(_bf);
         ASSERT(_workshopId < WG_MAX_WORKSHOP);
 
         bf = _bf;