Narrow exception scope
Add option for printing version number