UNDERTOW-295: NPE fixed
Merge pull request #238 from ddska/master

UNDERTOW-295: NPE fixed