Fixing UNDERTOW-336:  restored import order and catch IllegalArgumentException