Fixed NPE due to "datasource" becoming part of "dswId"
Merge pull request #519 from e-cuellar/5.2

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