Slightly more robust pickup/niter0 check