diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py
index 5cd7abd4184..af1bc89fa6d 100644
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -117,7 +117,8 @@ class Configuration( object ):
         if global_conf and "__file__" in global_conf:
             global_conf_parser.read(global_conf['__file__'])
         # Heartbeat log file name override
-        self.heartbeat_log = global_conf.get( 'heartbeat_log', 'heartbeat.log' )
+        if global_conf is not None:
+            self.heartbeat_log = global_conf.get( 'heartbeat_log', 'heartbeat.log' )
         #Store per-tool runner config
         try:
             self.tool_runners = global_conf_parser.items("galaxy:tool_runners")