UNDERTOW-295: NPE fixed