Merge "Add error handling if testscenarios aren't supported"