DFix the code

Catching errors in CLI applications smells a bit wrong