Merge "Bug 7916: MatchConvertorImpl detailed IllegalStateException instead NPE"