Better handle of unknown command line options

Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com>