diff --git a/migrations/github.go b/migrations/github.go
index 5902e4e..9c0db7b 100644
--- a/migrations/github.go
+++ b/migrations/github.go
@@ -99,8 +99,9 @@ func (fm *FetchMigratory) MigrateFromGitHub() error {
 					"repo": fmt.Sprintf("%s/%s", fm.RepoOwner, fm.RepoName),
 				}).Errorf("migration failed: %v", fm.Status.FatalError)
 				return err
+			} else {
+				comments = *cmts
 			}
-			comments = *cmts
 			if err != nil {
 				fm.Status.Stage = Failed
 				fm.Status.FatalError = err
diff --git a/migrations/job_test.go b/migrations/job_test.go
index 711752d..64887b7 100644
--- a/migrations/job_test.go
+++ b/migrations/job_test.go
@@ -10,9 +10,11 @@ import (
 func TestJob_StatusReport(t *testing.T) {
 	jobWithStatus := func(status *MigratoryStatus) *Job {
 		return &Job{
-			migratories: map[string]*Migratory{
+			migratories: map[string]*FetchMigratory{
 				"test/test": {
-					Status: status,
+					Migratory: Migratory{
+						Status: status,
+					},
 				},
 			},
 			Repositories: []string{