Throw exceptions only when datasource has wrong package, not check for i...

...nstance of Datasource