feat-safe-guard

safe guard