SWITCHYARD-1245 Improved fault reporting and flexibility