XDS fix + exception when parameters not compatible

See title :)
Merge branch 'pr/n108_wforums'