Verifier made more robust
Verifier made more robust

kgjamieson/NEXT,nextml/NEXT,nextml/NEXT,nextml/NEXT,sumeetsk/NEXT,sumeetsk/NEXT,nextml/NEXT,sumeetsk/NEXT,sumeetsk/NEXT,kgjamieson/NEXT,kgjamieson/NEXT,kgjamieson/NEXT