Added fix for datasource error message