Removed ValueError handling to defer to default handler