diff --git a/lib/galaxy/tools/data/__init__.py b/lib/galaxy/tools/data/__init__.py
index 2f648ac0b0c..ecff997dbfd 100644
--- a/lib/galaxy/tools/data/__init__.py
+++ b/lib/galaxy/tools/data/__init__.py
@@ -335,11 +335,13 @@ class TabularToolDataTable( ToolDataTable, Dictifiable ):
 
     def get_named_fields_list( self ):
         rval = []
-        named_colums = self.get_column_name_list()
+        named_columns = self.get_column_name_list()
         for fields in self.get_fields():
             field_dict = {}
             for i, field in enumerate( fields ):
-                field_name = named_colums[i]
+                if i == len( named_columns ):
+                    break
+                field_name = named_columns[i]
                 if field_name is None:
                     field_name = i #check that this is supposed to be 0 based.
                 field_dict[ field_name ] = field