If this check has to stay in, then at least leave it in consistently.