Clean up command line exception handling
Merge branch 'master' of https://github.com/BMKEG/digitalLibraryDao