diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 3c88be0679765a2c8a4597df104d66769f386906..110f5fbb5c46189b26da708c5083ef30e56a8c32 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -109,7 +109,7 @@ class DeviceHandler(BaseHandler):
         """
         try:
             device = yield self.store.get_device(user_id, device_id)
-        except errors.StoreError, e:
+        except errors.StoreError:
             raise errors.NotFoundError
         ips = yield self.store.get_last_client_ip_by_device(
             devices=((user_id, device_id),)
diff --git a/tests/handlers/test_device.py b/tests/handlers/test_device.py
index 73f09874d83d2d821a933b098a6cb3b5d69ee576..87c3c75aeafccf8e9e5cf33d30e527eb658987c6 100644
--- a/tests/handlers/test_device.py
+++ b/tests/handlers/test_device.py
@@ -22,6 +22,7 @@ from tests import unittest, utils
 user1 = "@boris:aaa"
 user2 = "@theresa:bbb"
 
+
 class DeviceTestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         super(DeviceTestCase, self).__init__(*args, **kwargs)