diff --git a/src/Jaeger/Propagator/JaegerPropagator.php b/src/Jaeger/Propagator/JaegerPropagator.php
index 763435f..74c9efb 100644
--- a/src/Jaeger/Propagator/JaegerPropagator.php
+++ b/src/Jaeger/Propagator/JaegerPropagator.php
@@ -86,6 +86,9 @@ public function extract($format, $carrier){
             }
         }
 
+        if ($spanContext === null) {
+            return new SpanContext(0, 0, 0, null, 0);
+        }
 
         return $spanContext;
     }
diff --git a/tests/Propagator/JaegerPropagatorTest.php b/tests/Propagator/JaegerPropagatorTest.php
index 937a4e7..b1d14cb 100644
--- a/tests/Propagator/JaegerPropagatorTest.php
+++ b/tests/Propagator/JaegerPropagatorTest.php
@@ -148,13 +148,12 @@ public function testExtractPsr7(){
         $this->assertTrue($context->spanId == 1562237095801441413);
         $this->assertTrue($context->flags == 1);
     }
-
-
-    public function testExtractReturnsNull(){
+    
+    public function testExtractReturnsSpanContext(){
         $jaeger = new JaegerPropagator();
         $carrier = [];
 
         $context = $jaeger->extract(Formats\TEXT_MAP, $carrier);
-        $this->assertNull($context);
+        $this->assertInstanceOf(\Jaeger\SpanContext::class, $context);
     }
 }