Fixed npe while getting data source name for local files.
Merge pull request #380 from jawallace/data_source_name

Fixed npe while getting data source name for local files.
Merge branch 'master' into develop