fix: safer callback handling and argument validation#5

wemeetagain merged 2 commits intomainChainSafe/zapi:mainfrom

nh/safer-callback-handlingChainSafe/zapi:nh/safer-callback-handlingCopy head branch name to clipboard