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

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