Better exception handling. Fixed default command line option.