diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c2aceec..6aefa944 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.1 (2015-08-12)
+
+* Fixed the BlameListener
+
 ## 1.2.0 (2015-08-12)
 
 Bugfixes:
diff --git a/EventListener/BlameListener.php b/EventListener/BlameListener.php
index 6e219613..0b4a8db3 100644
--- a/EventListener/BlameListener.php
+++ b/EventListener/BlameListener.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -18,10 +19,8 @@
  */
 class BlameListener implements EventSubscriberInterface
 {
-    /**
-     * @var SecurityContextInterface
-     */
-    private $securityContext;
+    private $authorizationChecker;
+    private $tokenStorage;
 
     /**
      * @var BlameableListener
@@ -54,12 +53,16 @@ public function __construct(BlameableListener $blameableListener, $tokenStorage
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
-        if (null === $this->securityContext) {
+        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+            return;
+        }
+
+        if (null === $this->tokenStorage || null === $this->authorizationChecker) {
             return;
         }
 
-        $token = $this->securityContext->getToken();
-        if (null !== $token && $this->securityContext->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
+        $token = $this->tokenStorage->getToken();
+        if (null !== $token && $this->authorizationChecker->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
             $this->blameableListener->setUserValue($token->getUser());
         }
     }