Merge pull request #511 from Laaas/master

Check for invalid spans, and if so, use Span::call_site() instead