am 5161f209: Fix crashing bug in validator.

* commit '5161f20925ec071e72c2b0eb084f7abaa9dffabf':
  Fix crashing bug in validator.