Slightly better error detection.