Merge 0.1.x (cli exception fixes)