enhancing readability #CXF-5688
This closes #24
[CXF-6010] Fix potential NPE
Patch from Eirik Bjorsnos applied