findCurrentSection null check added