[UNDERTOW-2536] Fix include parameters on error and add rudimentary test

[UNDERTOW-2536] Fix include parameters on error and add rudimentary test #1650