diff --git a/client/galaxy/scripts/mvc/tools/tools-form-base.js b/client/galaxy/scripts/mvc/tools/tools-form-base.js
index 6e759f462c2..6da95c6efb5 100644
--- a/client/galaxy/scripts/mvc/tools/tools-form-base.js
+++ b/client/galaxy/scripts/mvc/tools/tools-form-base.js
@@ -118,7 +118,7 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view',
                     console.debug(response);
 
                     // show error
-                    var error_message = ( response && response.error ) || ( response && response.err_msg ) || 'Uncaught error.';
+                    var error_message = ( response && response.err_msg ) || 'Uncaught error.';
                     if ( self.$el.is(':empty') ) {
                         self.$el.prepend((new Ui.Message({
                             message     : error_message,
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 153625598b4..42a9eeec5c5 100755
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -2156,12 +2156,9 @@ class Tool( object, Dictifiable ):
             else:
                 history = trans.get_history()
             if history is None:
-                raise Exception('History unavailable. Please specify a valid history id')
+                raise exceptions.MessageException( 'History unavailable. Please specify a valid history id' )
         except Exception, e:
-            trans.response.status = 500
-            error = '[history_id=%s] Failed to retrieve history. %s.' % (history_id, str(e))
-            log.exception('tools::to_json - %s.' % error)
-            return { 'error': error }
+            raise exceptions.MessageException( '[history_id=%s] Failed to retrieve history. %s.' % ( history_id, str( e ) ) )
 
         # load job parameters into incoming
         tool_message = ''
@@ -2172,10 +2169,8 @@ class Tool( object, Dictifiable ):
                 self._map_source_to_history( trans, self.inputs, job_params, history )
                 tool_message = self._compare_tool_version(trans, job)
                 params_to_incoming( kwd, self.inputs, job_params, trans.app, to_html=False )
-            except Exception, exception:
-                trans.response.status = 500
-                log.error( str( exception ) )
-                return { 'error': str( exception ) }
+            except Exception, e:
+                raise exceptions.MessageException( str( e ) )
 
         # create parameter object
         params = galaxy.util.Params( kwd, sanitize=False )
@@ -2460,10 +2455,6 @@ class Tool( object, Dictifiable ):
             'history_id'    : trans.security.encode_id( history.id )
         })
 
-        # check for errors
-        if 'error' in tool_message:
-            return tool_message
-
         # return enriched tool model
         return tool_model
 
@@ -2553,8 +2544,7 @@ class Tool( object, Dictifiable ):
         try:
             select_field, tools, tool = self.app.toolbox.get_tool_components( tool_id, tool_version=tool_version, get_loaded_tools_by_lineage=False, set_selected=True )
             if tool is None:
-                trans.response.status = 500
-                return { 'error': 'This dataset was created by an obsolete tool (%s). Can\'t re-run.' % tool_id }
+                raise exceptions.MessageException( 'This dataset was created by an obsolete tool (%s). Can\'t re-run.' % tool_id )
             if ( self.id != tool_id and self.old_id != tool_id ) or self.version != tool_version:
                 if self.id == tool_id:
                     if tool_version is None:
@@ -2573,9 +2563,8 @@ class Tool( object, Dictifiable ):
                     else:
                         message = 'This job was initially run with tool id "%s", version "%s", which is ' % ( tool_id, tool_version )
                         message += 'currently not available.  You can re-run the job with this tool, which is a derivation of the original tool.'
-        except Exception, error:
-            trans.response.status = 500
-            return { 'error': str(error) }
+        except Exception, e:
+            raise exceptions.MessageException( str( e ) )
         return message
 
     def get_default_history_by_trans( self, trans, create=False ):
diff --git a/static/maps/mvc/tools/tools-form-base.js.map b/static/maps/mvc/tools/tools-form-base.js.map
index 590f3c1a30f..c63d473ca51 100644
--- a/static/maps/mvc/tools/tools-form-base.js.map
+++ b/static/maps/mvc/tools/tools-form-base.js.map
@@ -1 +1 @@
-{"version":3,"file":"tools-form-base.js","sources":["../../../src/mvc/tools/tools-form-base.js"],"names":["define","Utils","Deferred","Ui","Form","ToolTemplate","CitationModel","CitationView","Backbone","View","extend","initialize","options","this","merge","setElement","deferred","inputs","_buildForm","_buildModel","self","icon","title","name","description","version","operations","_operations","onchange","reset","execute","_updateModel","customize","form","_footer","$el","empty","append","hide_message","id","job_id","build_url","Galaxy","root","params","tool_id","_","each","item","key","indexOf","process_id","register","request","type","url","success","new_model","message","update","status","persistent","done","console","debug","error","response","error_message","err_msg","is","prepend","Message","large","modal","show","body","buttons","Close","hide","model_url","update_url","current_state","tool_version","$","data","create","wait","versions_button","ButtonMenu","narrow","tooltip","is_workflow","versions","length","i","addMenu","onclick","replace","menu_button","biostar_url","window","open","prompt","location","origin","user","get","href","requirements","visible","sharable_url","menu","help","citations","$citations","ToolCitationCollection","citation_list_view","CitationListView","el","collection","render","fetch"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"tools-form-base.js","sources":["../../../src/mvc/tools/tools-form-base.js"],"names":["define","Utils","Deferred","Ui","Form","ToolTemplate","CitationModel","CitationView","Backbone","View","extend","initialize","options","this","merge","setElement","deferred","inputs","_buildForm","_buildModel","self","icon","title","name","description","version","operations","_operations","onchange","reset","execute","_updateModel","customize","form","_footer","$el","empty","append","hide_message","id","job_id","build_url","Galaxy","root","params","tool_id","_","each","item","key","indexOf","process_id","register","request","type","url","success","new_model","message","update","status","persistent","done","console","debug","error","response","error_message","err_msg","is","prepend","Message","large","modal","show","body","buttons","Close","hide","model_url","update_url","current_state","tool_version","$","data","create","wait","versions_button","ButtonMenu","narrow","tooltip","is_workflow","versions","length","i","addMenu","onclick","replace","menu_button","biostar_url","window","open","prompt","location","origin","user","get","href","requirements","visible","sharable_url","menu","help","citations","$citations","ToolCitationCollection","citation_list_view","CitationListView","el","collection","render","fetch"],"mappings":"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"}
\ No newline at end of file
diff --git a/static/scripts/mvc/tools/tools-form-base.js b/static/scripts/mvc/tools/tools-form-base.js
index b0ad9b09fc9..a314ec10bec 100644
--- a/static/scripts/mvc/tools/tools-form-base.js
+++ b/static/scripts/mvc/tools/tools-form-base.js
@@ -1,2 +1,2 @@
-define(["utils/utils","utils/deferred","mvc/ui/ui-misc","mvc/form/form-view","mvc/tools/tools-template","mvc/citation/citation-model","mvc/citation/citation-view"],function(a,b,c,d,e,f,g){return Backbone.View.extend({initialize:function(c){this.options=a.merge(c,{}),this.setElement("<div/>"),this.deferred=new b,c.inputs?this._buildForm(c):this._buildModel(c,!0)},_buildForm:function(b){var c=this;this.options=a.merge(b,this.options),this.options=a.merge({icon:"fa-wrench",title:"<b>"+b.name+"</b> "+b.description+" (Galaxy Tool Version "+b.version+")",operations:this._operations(),onchange:function(){c.deferred.reset(),c.deferred.execute(function(){c._updateModel()})}},this.options),this.options.customize&&this.options.customize(this.options),this.form=new d(this.options),this._footer(),this.$el.empty(),this.$el.append(this.form.$el)},_buildModel:function(b,d){var e=this;if(this.options.id=b.id,this.options.version=b.version,b.job_id)f=Galaxy.root+"api/jobs/"+b.job_id+"/build_for_rerun";else{var f=Galaxy.root+"api/tools/"+b.id+"/build?";b.version&&(f+="tool_version="+b.version+"&"),Galaxy.params&&Galaxy.params.tool_id==b.id&&_.each(Galaxy.params,function(a,b){-1==["tool_version","tool_id"].indexOf(b)&&(f+=b+"="+a+"&")})}var g=this.deferred.register();a.request({type:"GET",url:f,success:function(a){e._buildForm(a.tool_model||a),!d&&e.form.message.update({status:"success",message:"Now you are using '"+e.options.name+"' version "+e.options.version+".",persistent:!1}),e.deferred.done(g),console.debug("tools-form::initialize() - Initial tool model ready."),console.debug(a)},error:function(a){e.deferred.done(g),console.debug("tools-form::initialize() - Initial tool model request failed."),console.debug(a);var b=a&&a.error||a&&a.err_msg||"Uncaught error.";e.$el.is(":empty")?e.$el.prepend(new c.Message({message:b,status:"danger",persistent:!0,large:!0}).$el):Galaxy.modal.show({title:"Tool request failed",body:b,buttons:{Close:function(){Galaxy.modal.hide()}}})}})},_updateModel:function(){var b=this.options.update_url||Galaxy.root+"api/tools/"+this.options.id+"/build",c=this,d=this.form,e={tool_id:this.options.id,tool_version:this.options.version,inputs:$.extend(!0,{},c.form.data.create())};d.wait(!0);var f=this.deferred.register();console.debug("tools-form-base::_updateModel() - Sending current state (see below)."),console.debug(e),a.request({type:"POST",url:b,data:e,success:function(a){c.form.update(a.tool_model||a),c.options.update&&c.options.update(a),d.wait(!1),console.debug("tools-form-base::_updateModel() - Received new model (see below)."),console.debug(a),c.deferred.done(f)},error:function(a){c.deferred.done(f),console.debug("tools-form-base::_updateModel() - Refresh request failed."),console.debug(a)}})},_operations:function(){var a=this,b=this.options,d=new c.ButtonMenu({icon:"fa-cubes",title:!b.narrow&&"Versions"||null,tooltip:"Select another tool version"});if(!b.is_workflow&&b.versions&&b.versions.length>1)for(var f in b.versions){var g=b.versions[f];g!=b.version&&d.addMenu({title:"Switch to "+g,version:g,icon:"fa-cube",onclick:function(){var c=b.id.replace(b.version,this.version),d=this.version;a.deferred.reset(),a.deferred.execute(function(){a._buildModel({id:c,version:d})})}})}else d.$el.hide();var h=new c.ButtonMenu({icon:"fa-caret-down",title:!b.narrow&&"Options"||null,tooltip:"View available options"});return b.biostar_url&&(h.addMenu({icon:"fa-question-circle",title:"Question?",tooltip:"Ask a question about this tool (Biostar)",onclick:function(){window.open(b.biostar_url+"/p/new/post/")}}),h.addMenu({icon:"fa-search",title:"Search",tooltip:"Search help for this tool (Biostar)",onclick:function(){window.open(b.biostar_url+"/local/search/page/?q="+b.name)}})),h.addMenu({icon:"fa-share",title:"Share",tooltip:"Share this tool",onclick:function(){prompt("Copy to clipboard: Ctrl+C, Enter",window.location.origin+Galaxy.root+"root?tool_id="+b.id)}}),Galaxy.user&&Galaxy.user.get("is_admin")&&h.addMenu({icon:"fa-download",title:"Download",tooltip:"Download this tool",onclick:function(){window.location.href=Galaxy.root+"api/tools/"+b.id+"/download"}}),b.requirements&&b.requirements.length>0&&h.addMenu({icon:"fa-info-circle",title:"Requirements",tooltip:"Display tool requirements",onclick:function(){this.visible?(this.visible=!1,a.form.message.update({message:""})):(this.visible=!0,a.form.message.update({persistent:!0,message:e.requirements(b),status:"info"}))}}),b.sharable_url&&h.addMenu({icon:"fa-external-link",title:"See in Tool Shed",tooltip:"Access the repository",onclick:function(){window.open(b.sharable_url)}}),{menu:h,versions:d}},_footer:function(){var a=this.options;if(""!=a.help&&this.form.$el.append(e.help(a)),a.citations){var b=$("<div/>"),c=new f.ToolCitationCollection;c.tool_id=a.id;var d=new g.CitationListView({el:b,collection:c});d.render(),c.fetch(),this.form.$el.append(b)}}})});
+define(["utils/utils","utils/deferred","mvc/ui/ui-misc","mvc/form/form-view","mvc/tools/tools-template","mvc/citation/citation-model","mvc/citation/citation-view"],function(a,b,c,d,e,f,g){return Backbone.View.extend({initialize:function(c){this.options=a.merge(c,{}),this.setElement("<div/>"),this.deferred=new b,c.inputs?this._buildForm(c):this._buildModel(c,!0)},_buildForm:function(b){var c=this;this.options=a.merge(b,this.options),this.options=a.merge({icon:"fa-wrench",title:"<b>"+b.name+"</b> "+b.description+" (Galaxy Tool Version "+b.version+")",operations:this._operations(),onchange:function(){c.deferred.reset(),c.deferred.execute(function(){c._updateModel()})}},this.options),this.options.customize&&this.options.customize(this.options),this.form=new d(this.options),this._footer(),this.$el.empty(),this.$el.append(this.form.$el)},_buildModel:function(b,d){var e=this;if(this.options.id=b.id,this.options.version=b.version,b.job_id)f=Galaxy.root+"api/jobs/"+b.job_id+"/build_for_rerun";else{var f=Galaxy.root+"api/tools/"+b.id+"/build?";b.version&&(f+="tool_version="+b.version+"&"),Galaxy.params&&Galaxy.params.tool_id==b.id&&_.each(Galaxy.params,function(a,b){-1==["tool_version","tool_id"].indexOf(b)&&(f+=b+"="+a+"&")})}var g=this.deferred.register();a.request({type:"GET",url:f,success:function(a){e._buildForm(a.tool_model||a),!d&&e.form.message.update({status:"success",message:"Now you are using '"+e.options.name+"' version "+e.options.version+".",persistent:!1}),e.deferred.done(g),console.debug("tools-form::initialize() - Initial tool model ready."),console.debug(a)},error:function(a){e.deferred.done(g),console.debug("tools-form::initialize() - Initial tool model request failed."),console.debug(a);var b=a&&a.err_msg||"Uncaught error.";e.$el.is(":empty")?e.$el.prepend(new c.Message({message:b,status:"danger",persistent:!0,large:!0}).$el):Galaxy.modal.show({title:"Tool request failed",body:b,buttons:{Close:function(){Galaxy.modal.hide()}}})}})},_updateModel:function(){var b=this.options.update_url||Galaxy.root+"api/tools/"+this.options.id+"/build",c=this,d=this.form,e={tool_id:this.options.id,tool_version:this.options.version,inputs:$.extend(!0,{},c.form.data.create())};d.wait(!0);var f=this.deferred.register();console.debug("tools-form-base::_updateModel() - Sending current state (see below)."),console.debug(e),a.request({type:"POST",url:b,data:e,success:function(a){c.form.update(a.tool_model||a),c.options.update&&c.options.update(a),d.wait(!1),console.debug("tools-form-base::_updateModel() - Received new model (see below)."),console.debug(a),c.deferred.done(f)},error:function(a){c.deferred.done(f),console.debug("tools-form-base::_updateModel() - Refresh request failed."),console.debug(a)}})},_operations:function(){var a=this,b=this.options,d=new c.ButtonMenu({icon:"fa-cubes",title:!b.narrow&&"Versions"||null,tooltip:"Select another tool version"});if(!b.is_workflow&&b.versions&&b.versions.length>1)for(var f in b.versions){var g=b.versions[f];g!=b.version&&d.addMenu({title:"Switch to "+g,version:g,icon:"fa-cube",onclick:function(){var c=b.id.replace(b.version,this.version),d=this.version;a.deferred.reset(),a.deferred.execute(function(){a._buildModel({id:c,version:d})})}})}else d.$el.hide();var h=new c.ButtonMenu({icon:"fa-caret-down",title:!b.narrow&&"Options"||null,tooltip:"View available options"});return b.biostar_url&&(h.addMenu({icon:"fa-question-circle",title:"Question?",tooltip:"Ask a question about this tool (Biostar)",onclick:function(){window.open(b.biostar_url+"/p/new/post/")}}),h.addMenu({icon:"fa-search",title:"Search",tooltip:"Search help for this tool (Biostar)",onclick:function(){window.open(b.biostar_url+"/local/search/page/?q="+b.name)}})),h.addMenu({icon:"fa-share",title:"Share",tooltip:"Share this tool",onclick:function(){prompt("Copy to clipboard: Ctrl+C, Enter",window.location.origin+Galaxy.root+"root?tool_id="+b.id)}}),Galaxy.user&&Galaxy.user.get("is_admin")&&h.addMenu({icon:"fa-download",title:"Download",tooltip:"Download this tool",onclick:function(){window.location.href=Galaxy.root+"api/tools/"+b.id+"/download"}}),b.requirements&&b.requirements.length>0&&h.addMenu({icon:"fa-info-circle",title:"Requirements",tooltip:"Display tool requirements",onclick:function(){this.visible?(this.visible=!1,a.form.message.update({message:""})):(this.visible=!0,a.form.message.update({persistent:!0,message:e.requirements(b),status:"info"}))}}),b.sharable_url&&h.addMenu({icon:"fa-external-link",title:"See in Tool Shed",tooltip:"Access the repository",onclick:function(){window.open(b.sharable_url)}}),{menu:h,versions:d}},_footer:function(){var a=this.options;if(""!=a.help&&this.form.$el.append(e.help(a)),a.citations){var b=$("<div/>"),c=new f.ToolCitationCollection;c.tool_id=a.id;var d=new g.CitationListView({el:b,collection:c});d.render(),c.fetch(),this.form.$el.append(b)}}})});
 //# sourceMappingURL=../../../maps/mvc/tools/tools-form-base.js.map
\ No newline at end of file