diff --git a/config/datatypes_conf.xml.sample b/config/datatypes_conf.xml.sample
index 60f9613dd91..91d6d17c660 100644
--- a/config/datatypes_conf.xml.sample
+++ b/config/datatypes_conf.xml.sample
@@ -9,6 +9,7 @@
     <datatype extension="axt" type="galaxy.datatypes.sequence:Axt" display_in_upload="true" description="blastz pairwise alignment format.  Each alignment block in an axt file contains three lines: a summary line and 2 sequence lines.  Blocks are separated from one another by blank lines.  The summary line contains chromosomal position and size information about the alignment. It consists of 9 required fields." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Axt"/>
     <datatype extension="fli" type="galaxy.datatypes.tabular:FeatureLocationIndex" display_in_upload="false"/>
     <datatype extension="bam" type="galaxy.datatypes.binary:Bam" mimetype="application/octet-stream" display_in_upload="true" description="A binary file compressed in the BGZF format with a '.bam' file extension." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#BAM">
+      <converter file="bam_to_bai.xml" target_datatype="bai"/>
       <converter file="bam_to_bigwig_converter.xml" target_datatype="bigwig"/>
       <converter file="to_qname_sorted_bam.xml" target_datatype="qname_sorted.bam"/>
       <display file="ucsc/bam.xml"/>
@@ -17,6 +18,7 @@
       <display file="igb/bam.xml"/>
       <display file="iobio/bam.xml"/>
     </datatype>
+    <datatype extension="bai" type="galaxy.datatypes.binary:Binary" subclass="true" display_in_upload="false"/>
     <datatype extension="qname_input_sorted.bam" type="galaxy.datatypes.binary:BamInputSorted" mimetype="application/octet-stream" display_in_upload="false" description="A binary file compressed in the BGZF format with a '.bam' file extension and sorted based on the aligner output." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#BAM">
     </datatype>
     <datatype extension="qname_sorted.bam" type="galaxy.datatypes.binary:BamQuerynameSorted" mimetype="application/octet-stream" display_in_upload="true" description="A binary file compressed in the BGZF format with a '.bam' file extension and sorted by queryname." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#BAM">
diff --git a/lib/galaxy/datatypes/converters/bam_to_bai.xml b/lib/galaxy/datatypes/converters/bam_to_bai.xml
new file mode 100644
index 00000000000..1587ff83cab
--- /dev/null
+++ b/lib/galaxy/datatypes/converters/bam_to_bai.xml
@@ -0,0 +1,14 @@
+<tool id="CONVERTER_Bam_Bai_0" name="Bam to Bai" version="1.0.0" hidden="true">
+    <requirements>
+        <requirement type="package">samtools</requirement>
+    </requirements>
+    <command>samtools index '$input1' '$output1'</command>
+    <inputs>
+        <param format="bam" name="input1" type="data" label="Choose BAM"/>
+    </inputs>
+    <outputs>
+        <data format="bai" name="output1"/>
+    </outputs>
+    <help>
+    </help>
+</tool>
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index 4d0d36aa77c..a371ad17252 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -393,7 +393,7 @@ class WorkflowContentsManager(UsesAnnotations):
                     errors[step.id] = step_errors
         if missing_tools:
             workflow.annotation = self.get_item_annotation_str(trans.sa_session, trans.user, workflow)
-            raise exceptions.MessageException('Following tools missing: %s' % missing_tools)
+            raise exceptions.MessageException('Following tools missing: %s' % ', '.join(missing_tools))
         workflow.annotation = self.get_item_annotation_str(trans.sa_session, trans.user, workflow)
         step_order_indices = {}
         for step in workflow.steps:
diff --git a/lib/galaxy/tools/parameters/output_collect.py b/lib/galaxy/tools/parameters/output_collect.py
index 43f8417ee8b..1a8280725bc 100644
--- a/lib/galaxy/tools/parameters/output_collect.py
+++ b/lib/galaxy/tools/parameters/output_collect.py
@@ -404,7 +404,7 @@ class JobContext(object):
                 dbkey = self.input_dbkey
 
             # Create new primary dataset
-            name = fields_match.name or designation
+            dataset_name = fields_match.name or designation
 
             link_data = discovered_file.match.link_data
 
@@ -413,7 +413,7 @@ class JobContext(object):
                 designation=designation,
                 visible=visible,
                 dbkey=dbkey,
-                name=name,
+                name=dataset_name,
                 filename=filename,
                 metadata_source_name=metadata_source_name,
                 link_data=link_data,
diff --git a/scripts/grt/export.py b/scripts/grt/export.py
index 24587d4317b..aa824056e51 100644
--- a/scripts/grt/export.py
+++ b/scripts/grt/export.py
@@ -380,9 +380,9 @@ def main(argv):
             if job_tool_map[param[0]] in blacklisted_tools:
                 continue
 
-            sanitized = san.sanitize_data(job_tool_map[param[0]], param[1], param[2])
-
             try:
+                sanitized = san.sanitize_data(job_tool_map[param[0]], param[1], param[2])
+
                 handle_params.write(str(param[0]))
                 handle_params.write('\t')
                 handle_params.write(param[1])