diff --git a/master/buildbot/sourcestamp.py b/master/buildbot/sourcestamp.py
index 7bc99364169..fb8f5a127fd 100644
--- a/master/buildbot/sourcestamp.py
+++ b/master/buildbot/sourcestamp.py
@@ -100,12 +100,14 @@ def _make_ss(cls, ssid, ssdict, master):
         sourcestamp.revision = ssdict['revision']
         sourcestamp.project = ssdict['project']
         sourcestamp.repository = ssdict['repository']
-        sourcestamp.patch_info = (ssdict['patch_author'], ssdict['patch_comment'])
 
         sourcestamp.patch = None
         if ssdict['patch_body']:
             # note that this class does not store the patch_subdir
-            sourcestamp.patch = (ssdict['patch_level'], ssdict['patch_body'])
+            sourcestamp.patch = (ssdict['patch_level'],
+                                 ssdict['patch_body'])
+            sourcestamp.patch_info = (ssdict['patch_author'],
+                                      ssdict['patch_comment'])
         
         if ssdict['changeids']:
             # sort the changeids in order, oldest to newest