Fix exception message
Fix option help messages