Replace ValueError with raw exception?