Properly handle code verification