Fail statement if datasource is not configured
Better logging