diff --git a/near2eth/near2eth-block-relay/index.js b/near2eth/near2eth-block-relay/index.js
index b8090322b..241e72286 100644
--- a/near2eth/near2eth-block-relay/index.js
+++ b/near2eth/near2eth-block-relay/index.js
@@ -254,7 +254,7 @@ class Near2EthRelay {
 
             await clientContract.methods.addLightClientBlock(borshBlock).send({
               from: ethMasterAccount,
-              gas: 7000000,
+              gas: 10000000,
               handleRevert: true,
               gasPrice: gasPrice.mul(new BN(ethGasMultiplier))
             })
@@ -265,6 +265,7 @@ class Near2EthRelay {
             }
 
             console.log('Submitted.')
+            await sleep(240000) // To prevent submitting the same block again
             continue
           }
         }
diff --git a/near2eth/watchdog/index.js b/near2eth/watchdog/index.js
index d3aeaf0ff..572251ff8 100644
--- a/near2eth/watchdog/index.js
+++ b/near2eth/watchdog/index.js
@@ -79,7 +79,7 @@ class Watchdog {
                 .checkBlockProducerSignatureInHead(i)
                 .call()
             } catch (e) {
-              if (e.message.endsWith('This signature was skipped')) {
+              if (e.message.endsWith('No such signature')) {
                 console.log('Signature skipped')
                 continue
               } else {