Reverting quasi-fix of JENKINS-4588, as it merely obscured unrelated exceptions.
Anyway the originally reported stack trace looks like it could no longer happen, due to more robust model classes.