diff --git a/brewman/models/auth.py b/brewman/models/auth.py
index f05bf660..5e6e1396 100644
--- a/brewman/models/auth.py
+++ b/brewman/models/auth.py
@@ -45,6 +45,8 @@ class Client(Base):
 
     @classmethod
     def by_code(cls, code):
+        if code is None:
+            return None
         if not isinstance(code, int):
             code = int(code)
         return DBSession.query(cls).filter(cls.code == code).first()