UNDERTOW-110 Fix NPE