Fix for span is null
Merge pull request #234 from aesedepece/fix-span-is-null

Fix for span is null