Also improve exception message. (cherry picked from commit 94ec2b9c9c) Co-authored-by: Donghee Na <donghee.na92@gmail.com>
94ec2b9c9c