Make error detection stricter