diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 9564aef7..282253b7 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -163,7 +163,7 @@ class MicropubController extends Controller
     public function get(Request $request)
     {
         $tokenData = $this->tokenService->validateToken($request->bearerToken());
-        if ($valid === null) {
+        if ($tokenData === null) {
             return response()->json([
                 'response' => 'error',
                 'error' => 'invalid_token',
@@ -208,9 +208,9 @@ class MicropubController extends Controller
         return response()->json([
             'response' => 'token',
             'token' => [
-                'me' => $valid->getClaim('me'),
-                'scope' => $valid->getClaim('scope'),
-                'client_id' => $valid->getClaim('client_id'),
+                'me' => $tokenData->getClaim('me'),
+                'scope' => $tokenData->getClaim('scope'),
+                'client_id' => $tokenData->getClaim('client_id'),
             ],
         ]);
     }
diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php
index 536e08f1..6b83c91a 100644
--- a/tests/Feature/MicropubControllerTest.php
+++ b/tests/Feature/MicropubControllerTest.php
@@ -19,11 +19,11 @@ class MicropubControllerTest extends TestCase
      *
      * @return void
      */
-    public function test_micropub_request_without_token_returns_400_response()
+    public function test_micropub_request_without_token_returns_401_response()
     {
         $response = $this->get('/api/post');
-        $response->assertStatus(400);
-        $response->assertJsonFragment(['error_description' => 'No token provided with request']);
+        $response->assertStatus(401);
+        $response->assertJsonFragment(['error_description' => 'No access token was provided in the request']);
     }
 
     /**
@@ -202,9 +202,9 @@ class MicropubControllerTest extends TestCase
         $response
             ->assertJson([
                 'response' => 'error',
-                'error' => 'no_token'
+                'error' => 'unauthorized'
             ])
-            ->assertStatus(400);
+            ->assertStatus(401);
     }
 
     /**