Remove some unnecessary ValueError handling