Merge "[KV] Exceptions for error-handling"