Added better checks and messaging around strange key-holder behavior.