Add nil conditions