XDS fix + exception when parameters not compatible

See title :)