Prevent key-manager client crash