Bugfix nullpointer related to data sources