IMHO ISC_R_RANGE is a better error for PIN overflow.
At this exception the patches are fine.