diff --git a/projects/subgraph-beanstalk/manifests/ethereum.yaml b/projects/subgraph-beanstalk/manifests/ethereum.yaml
index 6d254ea214..a4f9bfc833 100644
--- a/projects/subgraph-beanstalk/manifests/ethereum.yaml
+++ b/projects/subgraph-beanstalk/manifests/ethereum.yaml
@@ -835,6 +835,8 @@ dataSources:
       abis:
         - name: Replanted
           file: ../../subgraph-core/abis/Beanstalk/Beanstalk-Replanted.json
+        - name: SeedGauge
+          file: ../../subgraph-core/abis/Beanstalk/Beanstalk-BIP45.json
       eventHandlers:
         - event: Sunrise(indexed uint256)
           handler: handleReplantSunrise
@@ -929,5 +931,5 @@ dataSources:
 # features:
 #   - grafting
 # graft:
-#   base: QmfJpxvEjd4BdhtGr42MVtjbgnz9PPUmJ35wf7XtCJXeaC
-#   block: 15279870
+#   base: QmRJCKP5nLjUNtR2ZZ9F62iBGiKLdkGPX7GzBZLgVfnz3c
+#   block: 15289930
diff --git a/projects/subgraph-beanstalk/src/entities/snapshots/WhitelistTokenSetting.ts b/projects/subgraph-beanstalk/src/entities/snapshots/WhitelistTokenSetting.ts
index 6e99dc56a2..2b08a6831e 100644
--- a/projects/subgraph-beanstalk/src/entities/snapshots/WhitelistTokenSetting.ts
+++ b/projects/subgraph-beanstalk/src/entities/snapshots/WhitelistTokenSetting.ts
@@ -162,17 +162,17 @@ export function setBdv(bdv: BigInt, whitelistTokenSetting: WhitelistTokenSetting
   // (the current season snapshots were already created)
   const prevHourly = WhitelistTokenHourlySnapshot.load(
     whitelistTokenSetting.id.toHexString() + "-" + (whitelistTokenSetting.lastHourlySnapshotSeason - 1).toString()
-  )!;
+  );
   const prevDaily = WhitelistTokenDailySnapshot.load(
     whitelistTokenSetting.id.toHexString() + "-" + (whitelistTokenSetting.lastDailySnapshotDay!.toI32() - 1).toString()
-  )!;
+  );
 
-  if (prevHourly != null) {
+  if (prevHourly != null && prevHourly.bdv !== null) {
     hourly.deltaBdv = hourly.bdv!.minus(prevHourly.bdv!);
   } else {
     hourly.deltaBdv = hourly.bdv;
   }
-  if (prevDaily != null) {
+  if (prevDaily != null && prevDaily.bdv !== null) {
     daily.deltaBdv = daily.bdv!.minus(prevDaily.bdv!);
   } else {
     daily.deltaBdv = daily.bdv;