Fixed NPE due to "datasource" becoming part of "dswId"