diff --git a/package.json b/package.json
index c60afd3..5a1df59 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@movie-web/extension",
   "displayName": "movie-web extension",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Enhance your movie-web experience with just one click",
   "author": "movie-web",
   "scripts": {
diff --git a/src/background/messages/hello.ts b/src/background/messages/hello.ts
index 84a8489..3ad39ac 100644
--- a/src/background/messages/hello.ts
+++ b/src/background/messages/hello.ts
@@ -14,6 +14,8 @@ type Response = BaseResponse<{
 
 const handler: PlasmoMessaging.MessageHandler<BaseRequest, Response> = async (req, res) => {
   try {
+    if (!req.sender?.tab?.url) throw new Error('No tab URL found in the request.');
+
     const version = getVersion();
     res.send({
       success: true,
@@ -24,7 +26,7 @@ const handler: PlasmoMessaging.MessageHandler<BaseRequest, Response> = async (re
   } catch (err) {
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : String(err),
     });
   }
 };
diff --git a/src/background/messages/makeRequest.ts b/src/background/messages/makeRequest.ts
index 61d77ca..14e0b77 100644
--- a/src/background/messages/makeRequest.ts
+++ b/src/background/messages/makeRequest.ts
@@ -32,7 +32,7 @@ type Response<T> = BaseResponse<{
 const mapBodyToFetchBody = (body: Request['body'], bodyType: Request['bodyType']): BodyInit => {
   if (bodyType === 'FormData') {
     const formData = new FormData();
-    body.forEach(([key, value]) => {
+    body.forEach(([key, value]: [any, any]) => {
       formData.append(key, value.toString());
     });
   }
@@ -50,6 +50,9 @@ const mapBodyToFetchBody = (body: Request['body'], bodyType: Request['bodyType']
 
 const handler: PlasmoMessaging.MessageHandler<Request, Response<any>> = async (req, res) => {
   try {
+    if (!req.sender?.tab?.url) throw new Error('No tab URL found in the request.');
+    if (!req.body) throw new Error('No request body found in the request.');
+
     const url = makeFullUrl(req.body.url, req.body);
     await assertDomainWhitelist(req.sender.tab.url);
 
@@ -91,7 +94,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, Response<any>> = async (r
     console.error('failed request', err);
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : String(err),
     });
   }
 };
diff --git a/src/background/messages/openPage.ts b/src/background/messages/openPage.ts
index 3b69788..28104f5 100644
--- a/src/background/messages/openPage.ts
+++ b/src/background/messages/openPage.ts
@@ -11,6 +11,9 @@ type Request = BaseRequest & {
 
 const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (req, res) => {
   try {
+    if (!req.sender?.tab?.id) throw new Error('No tab ID found in the request.');
+    if (!req.body) throw new Error('No body found in the request.');
+
     const searchParams = new URLSearchParams();
     searchParams.set('redirectUrl', req.body.redirectUrl);
     const url = (chrome || browser).runtime.getURL(`/tabs/${req.body.page}.html?${searchParams.toString()}`);
@@ -29,7 +32,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
   } catch (err) {
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : String(err),
     });
   }
 };
diff --git a/src/background/messages/prepareStream.ts b/src/background/messages/prepareStream.ts
index 2833433..6fb4fbe 100644
--- a/src/background/messages/prepareStream.ts
+++ b/src/background/messages/prepareStream.ts
@@ -15,6 +15,9 @@ interface Request extends BaseRequest {
 
 const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (req, res) => {
   try {
+    if (!req.sender?.tab?.url) throw new Error('No tab URL found in the request.');
+    if (!req.body) throw new Error('No request body found in the request.');
+
     await assertDomainWhitelist(req.sender.tab.url);
     await setDynamicRules(req.body);
     res.send({
@@ -23,7 +26,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
   } catch (err) {
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : String(err),
     });
   }
 };
diff --git a/src/hooks/useDomain.ts b/src/hooks/useDomain.ts
index 1f0ad57..f327410 100644
--- a/src/hooks/useDomain.ts
+++ b/src/hooks/useDomain.ts
@@ -15,5 +15,5 @@ export function useDomain(): null | string {
     };
   }, []);
 
-  return makeUrlIntoDomain(domain);
+  return domain ? makeUrlIntoDomain(domain) : null;
 }
diff --git a/src/hooks/useDomainWhitelist.ts b/src/hooks/useDomainWhitelist.ts
index a7cc42c..18c88f1 100644
--- a/src/hooks/useDomainWhitelist.ts
+++ b/src/hooks/useDomainWhitelist.ts
@@ -8,12 +8,12 @@ export function useDomainWhitelist() {
 
   const removeDomain = useCallback((domain: string | null) => {
     if (!domain) return;
-    setDomainWhitelist((s) => [...s.filter((v) => v !== domain)]);
+    setDomainWhitelist((s) => [...(s ?? []).filter((v) => v !== domain)]);
   }, []);
 
   const addDomain = useCallback((domain: string | null) => {
     if (!domain) return;
-    setDomainWhitelist((s) => [...s.filter((v) => v !== domain), domain]);
+    setDomainWhitelist((s) => [...(s ?? []).filter((v) => v !== domain), domain]);
   }, []);
 
   return {
diff --git a/src/tabs/PermissionGrant.css b/src/tabs/PermissionGrant.css
index 3c15cd2..e82eadf 100644
--- a/src/tabs/PermissionGrant.css
+++ b/src/tabs/PermissionGrant.css
@@ -13,7 +13,7 @@ body {
 #__plasmo {
   display: flex;
   flex-direction: column;
-  min-height: 100%;
+  height: 100%;
   background-color: #0A0A10;
 }
 
diff --git a/src/tabs/PermissionGrant.tsx b/src/tabs/PermissionGrant.tsx
index a8c238c..9730fd4 100644
--- a/src/tabs/PermissionGrant.tsx
+++ b/src/tabs/PermissionGrant.tsx
@@ -8,11 +8,27 @@ export default function PermissionGrant() {
   const { grantPermission } = usePermission();
 
   const queryParams = new URLSearchParams(window.location.search);
-  const redirectUrl = queryParams.get('redirectUrl') ?? 'https://mw.lonelil.ru';
-  const domain = makeUrlIntoDomain(redirectUrl);
+  const redirectUrl = queryParams.get('redirectUrl') ?? undefined;
+  const domain = redirectUrl ? makeUrlIntoDomain(redirectUrl) : undefined;
+
+  if (!domain) {
+    return (
+      <div className="permission-grant container">
+        <div className="inner-container">
+          <div className="permission-card">
+            <h1 className="color-white">Permission</h1>
+            <p className="text-color" style={{ textAlign: 'center' }}>
+              No domain found to grant permission to.
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
 
   const redirectBack = () => {
     chrome.tabs.getCurrent((tab) => {
+      if (!tab?.id) return;
       chrome.tabs.update(tab.id, { url: redirectUrl });
     });
   };
diff --git a/src/utils/declarativeNetRequest.ts b/src/utils/declarativeNetRequest.ts
index 0b1deaa..7b5e710 100644
--- a/src/utils/declarativeNetRequest.ts
+++ b/src/utils/declarativeNetRequest.ts
@@ -123,5 +123,6 @@ export const removeDynamicRules = async (ruleIds: number[]) => {
   await (chrome || browser).declarativeNetRequest.updateDynamicRules({
     removeRuleIds: ruleIds,
   });
-  if ((chrome || browser).runtime.lastError?.message) throw new Error((chrome || browser).runtime.lastError.message);
+  if ((chrome || browser).runtime.lastError?.message)
+    throw new Error((chrome || browser).runtime.lastError?.message ?? 'Unknown error');
 };
diff --git a/src/utils/tabs.ts b/src/utils/tabs.ts
index 00b538f..85a06a9 100644
--- a/src/utils/tabs.ts
+++ b/src/utils/tabs.ts
@@ -1,7 +1,7 @@
 import { isChrome } from './extension';
 
 export function queryCurrentDomain(cb: (domain: string | null) => void) {
-  const handle = (tabUrl: string | null) => {
+  const handle = (tabUrl: string | undefined) => {
     if (!tabUrl) cb(null);
     else cb(tabUrl);
   };
diff --git a/tsconfig.json b/tsconfig.json
index c4c5955..9c04ad2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,18 +1,13 @@
 {
   "extends": "plasmo/templates/tsconfig.base",
-  "exclude": [
-    "node_modules"
-  ],
-  "include": [
-    ".plasmo/index.d.ts",
-    "./**/*.ts",
-    "./**/*.tsx"
-  ],
+  "exclude": ["node_modules"],
+  "include": [".plasmo/index.d.ts", "./**/*.ts", "./**/*.tsx"],
+
   "compilerOptions": {
+    "jsx": "react-jsx",
+    "strict": true,
     "paths": {
-      "~*": [
-        "./src/*"
-      ]
+      "~*": ["./src/*"]
     },
     "baseUrl": "."
   }