Pass along options also in error cases.
Pass along options also in error cases.

odo/elli,elli-lib/elli,knutin/elli,K2InformaticsGmbH/elli,odo/elli,tsloughter/elli,tsloughter/elli,K2InformaticsGmbH/elli,knutin/elli,elli-lib/elli