Also, exclude invalid margin points from error measure. The iteration stop criterion
differs from the original one, which used hardcoded margins for this.