Improve error handling for Driver.
Improve error handling for Driver.

dmj/jing-trang,dmj/jing-trang,dmj/jing-trang,hanshuebner/jing-trang,brand/jing-trang,hanshuebner/jing-trang,hanshuebner/jing-trang,brand/jing-trang,brand/jing-trang