diff --git a/packages/v2-watcher/.husky/pre-commit b/packages/v2-watcher/.husky/pre-commit
old mode 100644
new mode 100755
diff --git a/packages/v2-watcher/README.md b/packages/v2-watcher/README.md
index b1a3627..0dd5c62 100644
--- a/packages/v2-watcher/README.md
+++ b/packages/v2-watcher/README.md
@@ -2,7 +2,7 @@
 
 ## Source
 
-* Subgraph: [sushiswap-subgraphs v0.1.1-watcher](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher)
+* Subgraph: [sushiswap-subgraphs v0.1.1-watcher-0.1.1](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher-0.1.1)
 
 ## Setup
 
diff --git a/packages/v2-watcher/environments/local.toml b/packages/v2-watcher/environments/local.toml
index f24df04..063d75e 100644
--- a/packages/v2-watcher/environments/local.toml
+++ b/packages/v2-watcher/environments/local.toml
@@ -64,7 +64,6 @@
 
 [upstream]
   [upstream.ethServer]
-    # gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
     rpcProviderEndpoints = [
       "http://127.0.0.1:8081"
     ]
@@ -93,6 +92,9 @@
   subgraphEventsOrder = true
   blockDelayInMilliSecs = 2000
 
+  # Number of blocks by which block processing lags behind head
+  blockProcessingOffset = 16
+
   # Boolean to switch between modes of processing events when starting the server.
   # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
   # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head).
diff --git a/packages/v2-watcher/package.json b/packages/v2-watcher/package.json
index e10ef00..fb19efd 100644
--- a/packages/v2-watcher/package.json
+++ b/packages/v2-watcher/package.json
@@ -39,11 +39,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.93",
-    "@cerc-io/ipld-eth-client": "^0.2.93",
-    "@cerc-io/solidity-mapper": "^0.2.93",
-    "@cerc-io/util": "^0.2.93",
-    "@cerc-io/graph-node": "^0.2.93",
+    "@cerc-io/cli": "^0.2.97",
+    "@cerc-io/ipld-eth-client": "^0.2.97",
+    "@cerc-io/solidity-mapper": "^0.2.97",
+    "@cerc-io/util": "^0.2.97",
+    "@cerc-io/graph-node": "^0.2.97",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/v2-watcher/src/resolvers.ts b/packages/v2-watcher/src/resolvers.ts
index 9e7ed05..b6ea311 100644
--- a/packages/v2-watcher/src/resolvers.ts
+++ b/packages/v2-watcher/src/resolvers.ts
@@ -81,6 +81,8 @@ const executeAndRecordMetrics = async (
       apiKey: expressContext.req.header('x-api-key'),
       origin: expressContext.req.headers.origin
     });
+
+    throw error;
   } finally {
     endTimer();
   }