diff --git a/lib/galaxy/util/shed_util.py b/lib/galaxy/util/shed_util.py
index 23512eed871..cf70499c2e7 100644
--- a/lib/galaxy/util/shed_util.py
+++ b/lib/galaxy/util/shed_util.py
@@ -533,7 +533,7 @@ def can_generate_tool_dependency_metadata( root, metadata_dict ):
                     if req_name==tool_dependency_name and req_version==tool_dependency_version and req_type==tool_dependency_type:
                         can_generate_dependency_metadata = True
                         break
-                if not can_generate_dependency_metadata:
+                if requirements and not can_generate_dependency_metadata:
                     # We've discovered at least 1 combination of name, version and type that is not defined in the <requirement>
                     # tag for any tool in the repository.
                     break
diff --git a/lib/galaxy/webapps/community/config.py b/lib/galaxy/webapps/community/config.py
index 3f07abaa336..c7a768eff9d 100644
--- a/lib/galaxy/webapps/community/config.py
+++ b/lib/galaxy/webapps/community/config.py
@@ -87,6 +87,7 @@ class Configuration( object ):
         self.server_name = ''
         self.job_manager = ''
         self.default_job_handlers = []
+        self.default_cluster_job_runner = 'local:///'
         self.job_handlers = []
         self.tool_handlers = []
         self.tool_runners = []