use better exception type
updated vendor