diff --git a/Option.php b/Option.php
index 1dd4265..81468e2 100644
--- a/Option.php
+++ b/Option.php
@@ -219,7 +219,7 @@ public function expect(string $errorMessage)
      */
     public function unwrap()
     {
-        return $this->expect('Unwrap a null value.');
+        return $this->expect('Called `' . __METHOD__ . '` on a none value.');
     }
 
     /**
diff --git a/Test/Unit/Option.php b/Test/Unit/Option.php
index bdf4ea8..2a095d5 100644
--- a/Test/Unit/Option.php
+++ b/Test/Unit/Option.php
@@ -191,8 +191,8 @@ public function case_none_unwrap()
             ->exception(function () use ($option) {
                 $option->unwrap();
             })
-            ->isInstanceOf(RuntimeException::class)
-                ->hasMessage('Unwrap a null value.');
+                ->isInstanceOf(RuntimeException::class)
+                ->hasMessage('Called `' . SUT::class . '::unwrap` on a none value.');
     }
 
     public function case_some_unwrap_or()