diff --git a/lib/galaxy/web/framework/__init__.py b/lib/galaxy/web/framework/__init__.py
index 69e2404a6d0..237cb4409a8 100644
--- a/lib/galaxy/web/framework/__init__.py
+++ b/lib/galaxy/web/framework/__init__.py
@@ -267,6 +267,7 @@ class UniverseWebTransaction( base.DefaultWebTransaction ):
         # remote_user middleware ensures HTTP_REMOTE_USER exists
         try:
             user = self.app.model.User.filter_by( email=self.environ[ 'HTTP_REMOTE_USER' ] ).first()
+            assert user is not None
         except:
             user = self.app.model.User( email=self.environ[ 'HTTP_REMOTE_USER' ] )
             user.set_password_cleartext( 'external' )