From 76a02fcf7628a4b5d23f08b67ce3d46d4fe232bc Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Thu, 8 Jan 2009 11:04:19 -0500
Subject: [PATCH] Fix from James Casbon for a problem he has experienced when
 using remote_user (a new user creation seems to be attempted before a session
 exists).

---
 lib/galaxy/web/framework/__init__.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/web/framework/__init__.py b/lib/galaxy/web/framework/__init__.py
index eecc34f4f42..4bceb09b491 100644
--- a/lib/galaxy/web/framework/__init__.py
+++ b/lib/galaxy/web/framework/__init__.py
@@ -138,13 +138,22 @@ class UniverseWebTransaction( base.DefaultWebTransaction ):
                 event.message = message % kwargs
             except:
                 event.message = message
-            event.history = self.history
+            try:
+                event.history = self.history
+            except:
+                event.history = None
             try:
                 event.history_id = self.history.id
             except:
                 event.history_id = None
-            event.user = self.user
-            event.session_id = self.galaxy_session.id   
+            try:
+                event.user = self.user
+            except:
+                event.user = None
+            try:
+                event.session_id = self.galaxy_session.id   
+            except:
+                event.session_id = None
             event.flush()
     def get_cookie( self, name='galaxysession' ):
         """Convenience method for getting a session cookie"""