Fixed missing variable declaration in FinalHandler