Fix #570
Merge pull request #571 from dmp42/get-source-null

Fix #570