correction of nil conditions