diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index a71627ea..90970ee0 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -54,8 +54,8 @@ void Hero::Initialize()
             (
              App::Instance()->AllocTempHeroUniId(),
              meta,
-             App::Instance()->AllocTempWeaponUniId(),
-             GetCurrWeapon()->meta,
+             GetCurrWeapon() ? App::Instance()->AllocTempWeaponUniId() : 0,
+             GetCurrWeapon() ? GetCurrWeapon()->meta : 0,
              0,
              nullptr
              );