fix for issue #879

https://github.com/NServiceBus/NServiceBus/issues/879
Merge pull request #924 from SimonCropp/patch-1

fix for issue #879