Added Navchuk error detection