Fix possible client crash on API misuse
3 files changed