diff --git a/pkg/modules/migration/create_from_structure.go b/pkg/modules/migration/create_from_structure.go
index 6529f8994..820c91101 100644
--- a/pkg/modules/migration/create_from_structure.go
+++ b/pkg/modules/migration/create_from_structure.go
@@ -356,8 +356,11 @@ func createProjectWithEverything(s *xorm.Session, project *models.ProjectWithTas
 		originalBucketID := t.BucketID
 		t.BucketID = 0
 		err = t.Create(s, user)
-		if err != nil && models.IsErrTaskCannotBeEmpty(err) {
-			continue
+		if err != nil {
+			if models.IsErrTaskCannotBeEmpty(err) {
+				continue
+			}
+			return err
 		}
 
 		t.BucketID = originalBucketID