Addendum to #28 - Resort the checks to be on the safe side of life.

There was still a problem when the data provider was named "default".