[CXF-6070] Instead of NPE, throw a more meaningful exception.
Recording .gitmergeinfo Changes