diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index 3b253eb6394..ddec77802be 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -595,7 +595,7 @@ class JobWrapper( object ):
                 self.real_path = real_path
                 self.false_path = false_path
             def __str__( self ):
-                if false_path is None:
+                if self.false_path is None:
                     return self.real_path
                 else:
                     return self.false_path
diff --git a/tools/data_source/biomart.xml b/tools/data_source/biomart.xml
index edfa563ebca..4f7e0303c67 100644
--- a/tools/data_source/biomart.xml
+++ b/tools/data_source/biomart.xml
@@ -9,7 +9,7 @@
 -->
 <tool name="BioMart" id="biomart" tool_type="data_source" URL_method="get" version="1.0.1">
 	<description>Central server</description>
-	<command interpreter="python">data_source.py $output</command>
+	<command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
 	<inputs action="http://www.biomart.org/biomart/martview" check_values="false" method="get" target="_top">
 		<display>go to BioMart Central $GALAXY_URL</display>
 		<param name="GALAXY_URL" type="baseurl" value="/tool_runner/biomart" />
diff --git a/tools/data_source/biomart_test.xml b/tools/data_source/biomart_test.xml
index 0f4bbdc3517..8893885ea06 100644
--- a/tools/data_source/biomart_test.xml
+++ b/tools/data_source/biomart_test.xml
@@ -9,7 +9,7 @@
 -->
 <tool name="BioMart" id="biomart_test" tool_type="data_source" URL_method="get" version="1.0.1">
 	<description>Test server</description>
-	<command interpreter="python">data_source.py $output</command>
+	<command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
 	<inputs action="http://test.biomart.org/biomart/martview" check_values="false" method="get" target="_top">
 		<display>go to BioMart Central $GALAXY_URL</display>
 		<param name="GALAXY_URL" type="baseurl" value="/tool_runner/biomart" />
diff --git a/tools/data_source/data_source.py b/tools/data_source/data_source.py
index 15b089c8452..f48754d2cc5 100644
--- a/tools/data_source/data_source.py
+++ b/tools/data_source/data_source.py
@@ -21,6 +21,10 @@ def check_gzip( filename ):
 
 def __main__():
     filename = sys.argv[1]
+    try:
+        max_file_size = int( sys.argv[2] )
+    except:
+        max_file_size = 0
     params = {}
     for line in open( filename, 'r' ):
         try:
@@ -50,6 +54,10 @@ def __main__():
             page = urllib.urlopen( URL, urllib.urlencode( params ) )
     except Exception, e:
         stop_err( 'The remote data source application may be off line, please try again later. Error: %s' % str( e ) )
+    if max_file_size:
+        file_size = int( page.info().get( 'Content-Length', 0 ) )
+        if file_size > max_file_size:
+            stop_err( 'The size of the data (%d bytes) you have requested exceeds the maximum allowed (%d bytes) on this server.' % ( file_size, max_file_size ) )
     out = open( filename, 'w' )
     while 1:
         chunk = page.read( CHUNK_SIZE )
diff --git a/tools/data_source/epigraph_import.xml b/tools/data_source/epigraph_import.xml
index abd0e69847e..ec6c489efa9 100644
--- a/tools/data_source/epigraph_import.xml
+++ b/tools/data_source/epigraph_import.xml
@@ -6,7 +6,7 @@
 -->
 <tool name="EpiGRAPH" id="epigraph_import" tool_type="data_source" URL_method="get">
     <description> server</description>
-    <command interpreter="python">data_source.py $output</command>
+    <command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
     <inputs action="http://epigraph.mpi-inf.mpg.de/WebGRAPH/faces/Login.jsp" check_values="false" method="get">
         <display>go to EpiGRAPH server $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=epigraph_import" />
diff --git a/tools/data_source/epigraph_import_test.xml b/tools/data_source/epigraph_import_test.xml
index 2d73e1930b3..d3ec24776ee 100644
--- a/tools/data_source/epigraph_import_test.xml
+++ b/tools/data_source/epigraph_import_test.xml
@@ -6,7 +6,7 @@
 -->
 <tool name="EpiGRAPH" id="epigraph_import_test" tool_type="data_source" URL_method="get">
     <description> test server</description>
-    <command interpreter="python">data_source.py $output</command>
+    <command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
     <inputs action="http://epigraph.mpi-inf.mpg.de/WebGRAPH_Public_Test/faces/Login.jsp" check_values="false" method="get">
         <display>go to EpiGRAPH server $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=epigraph_import_test" />
diff --git a/tools/data_source/eupathdb.xml b/tools/data_source/eupathdb.xml
index 17440b3ae3c..d371a4715fa 100644
--- a/tools/data_source/eupathdb.xml
+++ b/tools/data_source/eupathdb.xml
@@ -5,7 +5,7 @@
 -->
 <tool name="EuPathDB" id="eupathdb" tool_type="data_source" url_method="post">
     <description>server</description>
-    <command interpreter="python">data_source.py $output</command>
+    <command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
     <inputs action="http://galaxy.eupathdb.org/eupathdb.galaxy/queries_tools.jsp" check_values="false" method="post"> 
         <display>go to EuPathDB server $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=eupathdb" />
diff --git a/tools/data_source/flymine.xml b/tools/data_source/flymine.xml
index 035f38bf00c..e7d734e9115 100644
--- a/tools/data_source/flymine.xml
+++ b/tools/data_source/flymine.xml
@@ -6,7 +6,7 @@
 -->
 <tool name="Flymine" id="flymine" tool_type="data_source" URL_method="post">
     <description>server</description>
-    <command interpreter="python">data_source.py $output</command>
+    <command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
     <inputs action="http://www.flymine.org" check_values="false" method="get" target="_top"> 
         <display>go to Flymine server $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=flymine" />
diff --git a/tools/data_source/flymine_test.xml b/tools/data_source/flymine_test.xml
index 62c7b923a0e..0b6b45791f0 100644
--- a/tools/data_source/flymine_test.xml
+++ b/tools/data_source/flymine_test.xml
@@ -6,7 +6,7 @@
 -->
 <tool name="Flymine test" id="flymine_test" tool_type="data_source" URL_method="post">
     <description>server</description>
-    <command interpreter="python">data_source.py $output</command>
+    <command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
     <inputs action="http://preview.flymine.org/preview/begin.do" check_values="false" method="get" target="_top"> 
         <display>go to Flymine server $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=flymine" />
diff --git a/tools/data_source/gramene_mart.xml b/tools/data_source/gramene_mart.xml
index 3eed0531048..0f97a5f259b 100644
--- a/tools/data_source/gramene_mart.xml
+++ b/tools/data_source/gramene_mart.xml
@@ -9,7 +9,7 @@
 -->
 <tool name="GrameneMart" id="gramenemart" tool_type="data_source" URL_method="get" version="1.0.1">
     <description> Central server</description>
-    <command interpreter="python">data_source.py $output</command>
+    <command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
     <inputs action="http://www.gramene.org/biomart/martview" check_values="false" method="get" target="_top">
         <display>go to GrameneMart Central $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner/biomart" />
diff --git a/tools/data_source/ucsc_tablebrowser.xml b/tools/data_source/ucsc_tablebrowser.xml
index 250dae000d1..79244951834 100644
--- a/tools/data_source/ucsc_tablebrowser.xml
+++ b/tools/data_source/ucsc_tablebrowser.xml
@@ -6,7 +6,7 @@
 -->
 <tool name="UCSC Main" id="ucsc_table_direct1" tool_type="data_source" URL_method="post">
 	<description>table browser</description>
-	<command interpreter="python">data_source.py $output</command>
+	<command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
 	<inputs action="http://genome.ucsc.edu/cgi-bin/hgTables" check_values="false" method="get">
 		<display>go to UCSC Table Browser $GALAXY_URL</display>
 		<param name="GALAXY_URL" type="baseurl" value="/tool_runner" />
diff --git a/tools/data_source/ucsc_tablebrowser_archaea.xml b/tools/data_source/ucsc_tablebrowser_archaea.xml
index 0b6342a957d..cf09e18f0c7 100644
--- a/tools/data_source/ucsc_tablebrowser_archaea.xml
+++ b/tools/data_source/ucsc_tablebrowser_archaea.xml
@@ -6,7 +6,7 @@
 -->
 <tool name="UCSC Archaea" id="ucsc_table_direct_archaea1" tool_type="data_source" URL_method="post">
 	<description>table browser</description>
-	<command interpreter="python">data_source.py $output</command>
+	<command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
 	<inputs action="http://archaea.ucsc.edu/cgi-bin/hgTables" check_values="false" method="get">
 		<display>go to UCSC Table Browser $GALAXY_URL</display>
 		<param name="GALAXY_URL" type="baseurl" value="/tool_runner" />
diff --git a/tools/data_source/ucsc_tablebrowser_test.xml b/tools/data_source/ucsc_tablebrowser_test.xml
index d09862dd715..67b42ee7b2f 100644
--- a/tools/data_source/ucsc_tablebrowser_test.xml
+++ b/tools/data_source/ucsc_tablebrowser_test.xml
@@ -6,7 +6,7 @@
 -->
 <tool name="UCSC Test" id="ucsc_table_direct_test1" tool_type="data_source" URL_method="post">
 	<description>table browser</description>
-	<command interpreter="python">data_source.py $output</command>
+	<command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
 	<inputs action="http://genome-test.cse.ucsc.edu/cgi-bin/hgTables" check_values="false" method="get">
 		<display>go to UCSC Table Browser $GALAXY_URL</display>
 		<param name="GALAXY_URL" type="baseurl" value="/tool_runner" />
diff --git a/tools/data_source/wormbase.xml b/tools/data_source/wormbase.xml
index ef7d55b70bb..0005039aeb4 100644
--- a/tools/data_source/wormbase.xml
+++ b/tools/data_source/wormbase.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tool name="Wormbase" id="wormbase" tool_type="data_source" URL_method="post">
     <description>server</description>
-    <command interpreter="python">data_source.py $output</command>
+    <command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
     <inputs action="http://www.wormbase.org/db/seq/gbgff/c_elegans/" check_values="false" target="_top"> 
         <display>go to Wormbase server $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=wormbase" />
diff --git a/tools/data_source/wormbase_test.xml b/tools/data_source/wormbase_test.xml
index 32b32519f43..44bf34cc241 100644
--- a/tools/data_source/wormbase_test.xml
+++ b/tools/data_source/wormbase_test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tool name="Wormbase" id="wormbase_test" tool_type="data_source" URL_method="post">
 	<description>test server</description>
-	<command interpreter="python">data_source.py $output</command>
+	<command interpreter="python">data_source.py $output $__app__.config.output_size_limit</command>
 	<inputs action="http://dev.wormbase.org/db/seq/gbrowse/c_elegans/" check_values="false" target="_top"> 
 		<display>go to Wormbase test server $GALAXY_URL</display>
 		<param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=wormbase_test" />