better counting of skipped bytes
An NPException is an unpleasant thing.
Merge branch 'master' into portico