Fix possible client crash on API misuse
2 files changed