GUI-868
pushing this. will wait till blocker cleared to finish testing and improved except clause