diff --git a/lib/galaxy/webapps/galaxy/controllers/tool_runner.py b/lib/galaxy/webapps/galaxy/controllers/tool_runner.py
index 806c940923c..b4aa68f7771 100644
--- a/lib/galaxy/webapps/galaxy/controllers/tool_runner.py
+++ b/lib/galaxy/webapps/galaxy/controllers/tool_runner.py
@@ -39,16 +39,18 @@ class ToolRunner( BaseUIController ):
 
     @web.expose
     def index( self, trans, tool_id=None, from_noframe=None, **kwd ):
+        def __tool_404__():
+            log.error( 'index called with tool id \'%s\' but no such tool exists', tool_id )
+            trans.log_event( 'Tool id \'%s\' does not exist' % tool_id )
+            trans.response.status = 404
+            return trans.show_error_message('Tool \'%s\' does not exist.' % ( escape(tool_id) ))
         # tool id not available, redirect to main page
         if tool_id is None:
             return trans.response.send_redirect( url_for( controller='root', action='welcome' ) )
         tool = self.__get_tool( tool_id )
         # tool id is not matching, display an error
-        if not tool or not tool.allow_user_access( trans.user ):
-            log.error( 'index called with tool id \'%s\' but no such tool exists', tool_id )
-            trans.log_event( 'Tool id \'%s\' does not exist' % tool_id )
-            trans.response.status = 404
-            return trans.show_error_message('Tool \'%s\' does not exist.' % ( escape(tool_id) ))
+        if not tool:
+            return __tool_404__()
         if tool.require_login and not trans.user:
             redirect = url_for( controller='tool_runner', action='index', tool_id=tool_id, **kwd )
             return trans.response.send_redirect( url_for( controller='user',
@@ -57,6 +59,8 @@ class ToolRunner( BaseUIController ):
                                                           status='info',
                                                           message='You must be logged in to use this tool.',
                                                           redirect=redirect ) )
+        if not tool.allow_user_access( trans.user ):
+            return __tool_404__()
         if tool.tool_type == 'default':
             return trans.response.send_redirect( url_for( controller='root', tool_id=tool_id ) )