Handle unknown datasource error
Merge branch 'mvt' into exp