diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index dbddad051e..d4bdb4f586 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -273,11 +273,11 @@ def html_message_formatter(mode, name, build, results, master_status):
                 if log.getName() == 'stdio':
                     break
 
-            name = "%s.%s" % (step.getName(), log.getName())
+            name = "%s.%s" % (log.getStep().getName(), log.getName())
             status, dummy = log.getStep().getResults()
             content = log.getText().splitlines() # Note: can be VERY LARGE
             url = u'%s/steps/%s/logs/%s' % (master_status.getURLForThing(build),
-                                           step.getName(), log.getName())
+                                           log.getStep().getName(), log.getName())
 
             text.append(u'<br><br>')
             text.append(u'<i>Detailed log of the %s build step:</i> <a href="%s">%s</a>'