remove the null pointer to condition when none is set