diff --git a/service/bfg/bfg.go b/service/bfg/bfg.go
index 4f363342c..c0c3736bb 100644
--- a/service/bfg/bfg.go
+++ b/service/bfg/bfg.go
@@ -771,9 +771,7 @@ func (s *Server) walkChain(ctx context.Context, tip uint64, exitFast bool) error
 			if exitFast {
 				return nil
 			}
-		}
-
-		if err != nil {
+		} else if err != nil {
 			return err
 		}