Issue #32 - Replace Exception with ValueError