Fixed issue with null constructor for datasources.