improved non-blocking check (#138)