symfony
diff --git a/‎src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+11Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+11Lines changed: 11 additions & 0 deletions
@@ -158,7 +158,7 @@ private function attemptSwitchUser(Request $request)
      */
     private function attemptExitUser(Request $request)
     {
-        if (false === $original = $this->getOriginalToken($this->tokenStorage->getToken())) {
+        if (null === ($currentToken = $this->tokenStorage->getToken()) || false === $original = $this->getOriginalToken($currentToken)) {
             throw new AuthenticationCredentialsNotFoundException('Could not find original Token object.');
         }
 
 
@@ -65,6 +65,17 @@ public function testEventIsIgnoredIfUsernameIsNotPassedWithTheRequest()
         $this->assertNull($this->tokenStorage->getToken());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException
+     */
+    public function testExitUserThrowsAuthenticationExceptionIfNoCurrentToken()
+    {
+        $this->tokenStorage->setToken(null);
+        $this->request->query->set('_switch_user', '_exit');
+        $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager);
+        $listener->handle($this->event);
+    }
+
     /**
      * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException
      */
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ private function attemptSwitchUser(Request $request)`
`158`	`158`	`*/`
`159`	`159`	`private function attemptExitUser(Request $request)`
`160`	`160`	`{`
`161`		`- if (false === $original = $this->getOriginalToken($this->tokenStorage->getToken())) {`
	`161`	`+ if (null === ($currentToken = $this->tokenStorage->getToken()) \|\| false === $original = $this->getOriginalToken($currentToken)) {`
`162`	`162`	`throw new AuthenticationCredentialsNotFoundException('Could not find original Token object.');`
`163`	`163`	`}`
`164`	`164`