Fix getSourceName returning null (fixes #667)
Add additional NotNull and Nullable annotations
Merge pull request #722 from sharwell/fix-667

Fix multiple issues with getSourceName