diff --git a/lib/galaxy/webapps/galaxy/api/history_contents.py b/lib/galaxy/webapps/galaxy/api/history_contents.py
index d1d90d2badb..dc507d1a569 100644
--- a/lib/galaxy/webapps/galaxy/api/history_contents.py
+++ b/lib/galaxy/webapps/galaxy/api/history_contents.py
@@ -143,7 +143,7 @@ class HistoryContentsController( BaseAPIController, UsesHistoryDatasetAssociatio
             'purged': hda.purged,
             'hid'   : hda.hid,
             'history_content_type' : hda.history_content_type,
-            'url'   : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id, type="dataset" ),
+            'url'   : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id ),
         }
 
     def __collection_dict( self, trans, dataset_collection_instance, view="collection" ):
diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py
index 7382e893268..92756550dea 100644
--- a/lib/galaxy/webapps/galaxy/api/tools.py
+++ b/lib/galaxy/webapps/galaxy/api/tools.py
@@ -156,7 +156,7 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin, UsesHistoryMix
             output_dict[ 'output_name' ] = output_name
             outputs.append( trans.security.encode_dict_ids( output_dict ) )
 
-        for job in vars[ 'jobs' ]:
+        for job in vars.get('jobs', []):
             rval[ 'jobs' ].append( self.encode_all_ids( trans, job.to_dict( view='collection' ), recursive=True ) )
 
         for output_name, collection_instance in vars.get( 'implicit_collections', {} ).iteritems():