Fixes #1821

The correlation Id was getting over written to null.
Added an acceptance test for #1821