CONN-1125 Issue with null pointer plus jetty option
Merge pull request #797 from jsmith2/CONN-1125

CONN-1125 Issue with null pointer plus jetty option