In several places we hit an error state and exit using exit(),
instead of raising a ValueError - fixed this.