Properly raise exception when key is not found on server (#5415).
Merge remote-tracking branch 'refs/remotes/drebs/bug/5415_properly-raise-KeyNotFound' into develop