diff --git a/app/client/docker/templates/nginx-mac.conf.template b/app/client/docker/templates/nginx-mac.conf.template
index aa348e5cbd..5ebbe8481e 100644
--- a/app/client/docker/templates/nginx-mac.conf.template
+++ b/app/client/docker/templates/nginx-mac.conf.template
@@ -86,7 +86,7 @@ server {
     location / {
         proxy_pass http://host.docker.internal:3000;
         sub_filter __APPSMITH_SENTRY_DSN__ '${APPSMITH_SENTRY_DSN}';
-        sub_filter __APPSMITH_SMART_LOOK_ID__ '${APPSMITH_SMART_LOOK_ID};
+        sub_filter __APPSMITH_SMART_LOOK_ID__ '${APPSMITH_SMART_LOOK_ID}';
         sub_filter __APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__ '${APPSMITH_OAUTH2_GOOGLE_CLIENT_ID}';
         sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}';
         sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED}';
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index 0985723d23..88b4a41dd7 100755
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -9,25 +9,28 @@ import { Slide, ToastContainer } from "react-toastify";
 import store from "./store";
 import { LayersContext, Layers } from "constants/Layers";
 import AppRouter from "./AppRouter";
+import * as Sentry from "@sentry/react";
 
 appInitializer();
 
 const App = () => {
   return (
-    <Provider store={store}>
-      <LayersContext.Provider value={Layers}>
-        <ThemeProvider theme={theme}>
-          <ToastContainer
-            hideProgressBar
-            draggable={false}
-            transition={Slide}
-            autoClose={5000}
-            closeButton={false}
-          />
-          <AppRouter />
-        </ThemeProvider>
-      </LayersContext.Provider>
-    </Provider>
+    <Sentry.ErrorBoundary fallback={"An error has occured"}>
+      <Provider store={store}>
+        <LayersContext.Provider value={Layers}>
+          <ThemeProvider theme={theme}>
+            <ToastContainer
+              hideProgressBar
+              draggable={false}
+              transition={Slide}
+              autoClose={5000}
+              closeButton={false}
+            />
+            <AppRouter />
+          </ThemeProvider>
+        </LayersContext.Provider>
+      </Provider>
+    </Sentry.ErrorBoundary>
   );
 };