Fix a null condition