Keep both invalid and zero check