Tweaked the valid range exception
Revert "Tweaked the valid range exception"

This reverts commit c1be802697e5941f51c148abbf77bb8edcdbf615.