After talking to you all I can think when I see this is that we need a standard catch-all CLI exception to raise instead.