Fix minor robustness issues from code audit#25

Lucenx9 merged 1 commit intomainLucenx9/agentinit:mainfrom

fix/minor-robustness-improvementsLucenx9/agentinit:fix/minor-robustness-improvementsCopy head branch name to clipboard