Added additional check to see if workspaces in ADS. re #9240