Got rid of unnesc nil-check