diff --git a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-embed-in-web.tsx b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-embed-in-web.tsx
index 988f11b74..169e67293 100644
--- a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-embed-in-web.tsx
+++ b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-embed-in-web.tsx
@@ -1,13 +1,16 @@
 'use client';
 import { useEffect, useState } from 'react';
 import { CopyOutlined } from '@ant-design/icons';
-import { Button, Input, Checkbox, App } from 'antd';
+import { Button, Input, Checkbox, App, Select, Space, Result, message } from 'antd';
 import { useParams, useSearchParams } from 'next/navigation';
 import {
   generateSharedViewerUrl,
   updateProcessGuestAccessRights,
 } from '@/lib/sharing/process-sharing';
 import { useEnvironment } from '@/components/auth-can';
+import { Process } from '@/lib/data/process-schema';
+import { wrapServerCall } from '@/lib/wrap-server-call';
+import { isUserErrorResponse } from '@/lib/user-error';
 
 const { TextArea } = Input;
 
@@ -15,84 +18,92 @@ type ModelerShareModalOptionEmdedInWebProps = {
   sharedAs: 'public' | 'protected';
   allowIframeTimestamp: number;
   refresh: () => void;
+  processVersions: Process['versions'];
 };
 
 const ModelerShareModalOptionEmdedInWeb = ({
   sharedAs,
   allowIframeTimestamp,
   refresh,
+  processVersions,
 }: ModelerShareModalOptionEmdedInWebProps) => {
+  const app = App.useApp();
   const { processId } = useParams();
   const environment = useEnvironment();
   const [embeddingUrl, setEmbeddingUrl] = useState('');
-  const { message } = App.useApp();
 
   const query = useSearchParams();
-  const selectedVersionId = query.get('version');
+  const [selectedVersionId, setSelectedVersionId] = useState<string | null>(() => {
+    const queryVersion = query.get('version');
+    if (queryVersion && processVersions.find((version) => version.id === queryVersion))
+      return queryVersion;
+    else return processVersions[0]?.id;
+  });
 
   useEffect(() => {
-    const initialize = async () => {
-      if (allowIframeTimestamp > 0) {
-        try {
-          // generate an url with a token that contains the currently active embedding timestamp
-          const url = await generateSharedViewerUrl(
+    if (allowIframeTimestamp > 0 && selectedVersionId) {
+      wrapServerCall({
+        fn: () =>
+          generateSharedViewerUrl(
             {
               processId,
               embeddedMode: true,
               timestamp: allowIframeTimestamp,
             },
-            selectedVersionId || undefined,
-          );
-          setEmbeddingUrl(url);
-        } catch (error) {
-          console.error('Error while generating the url for embedding:', error);
-        }
-      }
-    };
-    initialize();
-  }, [allowIframeTimestamp, environment.spaceId, processId, sharedAs, selectedVersionId]);
+            selectedVersionId,
+          ),
+        onSuccess: (url) => setEmbeddingUrl(url),
+        app,
+      });
+    }
+  }, [allowIframeTimestamp, environment.spaceId, processId, sharedAs, selectedVersionId, app]);
 
   const handleAllowEmbeddingChecked = async (e: {
     target: { checked: boolean | ((prevState: boolean) => boolean) };
   }) => {
     const isChecked = e.target.checked;
     if (isChecked) {
-      try {
-        const timestamp = Date.now();
-        // generate an url containing a token with the newly generated timestamp
-        const url = await generateSharedViewerUrl(
-          {
+      // create embedding
+      const timestamp = Date.now();
+      await wrapServerCall({
+        fn: async () => {
+          const url = await generateSharedViewerUrl(
+            {
+              processId,
+              embeddedMode: true,
+              timestamp,
+            },
+            selectedVersionId!,
+          );
+          if (isUserErrorResponse(url)) return url;
+
+          const accessUpdateResult = await updateProcessGuestAccessRights(
             processId,
-            embeddedMode: true,
-            timestamp,
-          },
-          selectedVersionId || undefined,
-        );
-        setEmbeddingUrl(url);
-        // activate embedding for that specific timestamp
-        await updateProcessGuestAccessRights(
-          processId,
-          {
-            sharedAs: 'public',
-            allowIframeTimestamp: timestamp,
-          },
-          environment.spaceId,
-        );
-      } catch (err) {
-        message.error('An error occured while enabling embedding.');
-      }
+            {
+              sharedAs: 'public',
+              allowIframeTimestamp: timestamp,
+            },
+            environment.spaceId,
+          );
+          if (isUserErrorResponse(accessUpdateResult)) return accessUpdateResult;
+
+          return url;
+        },
+        onSuccess: (url) => setEmbeddingUrl(url),
+        app,
+      });
     } else {
       // deactivate embedding
-      try {
-        await updateProcessGuestAccessRights(
-          processId,
-          { allowIframeTimestamp: 0 },
-          environment.spaceId,
-        );
-        setEmbeddingUrl('');
-      } catch (err) {
-        message.error('An error occured while disabling embedding.');
-      }
+      await wrapServerCall({
+        fn: () =>
+          updateProcessGuestAccessRights(
+            processId,
+            { allowIframeTimestamp: 0 },
+            environment.spaceId,
+          ),
+        onSuccess: () => setEmbeddingUrl(''),
+        app,
+      });
     }
     refresh();
   };
@@ -104,8 +115,22 @@ const ModelerShareModalOptionEmdedInWeb = ({
     message.success('Code copied to you clipboard');
   };
 
+  if (processVersions.length === 0)
+    return (
+      <Result
+        status="warning"
+        title="No Process Versions"
+        subTitle="You can only embed process versions"
+      />
+    );
+
   return (
-    <>
+    <Space direction="vertical" style={{ width: '100%' }}>
+      <Select
+        defaultValue={selectedVersionId}
+        options={processVersions.map((version) => ({ value: version.id, label: version.name }))}
+        onChange={(value) => setSelectedVersionId(value)}
+      />
       <Checkbox
         checked={embeddingUrl.length > 0 && allowIframeTimestamp > 0}
         onChange={(e) => handleAllowEmbeddingChecked(e)}
@@ -123,11 +148,16 @@ const ModelerShareModalOptionEmdedInWeb = ({
             />
           </div>
           <div className="code">
-            <TextArea rows={2} value={iframeCode} style={{ backgroundColor: 'rgb(245,245,245)' }} />
+            <TextArea
+              rows={2}
+              value={iframeCode}
+              // @ts-expect-error fieldSizing works but isn't recognized as a valid field
+              style={{ backgroundColor: 'rgb(245,245,245)', fieldSizing: 'content' }}
+            />
           </div>
         </>
       ) : null}
-    </>
+    </Space>
   );
 };
 
diff --git a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-public-link.tsx b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-public-link.tsx
index 25e1f0ca2..54a301cdb 100644
--- a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-public-link.tsx
+++ b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal-option-public-link.tsx
@@ -11,6 +11,8 @@ import { useEnvironment } from '@/components/auth-can';
 
 import styles from './modeler-share-modal-option-public-link.module.scss';
 import { Process } from '@/lib/data/process-schema';
+import { wrapServerCall } from '@/lib/wrap-server-call';
+import { isUserErrorResponse } from '@/lib/user-error';
 
 type ModelerShareModalOptionPublicLinkProps = {
   sharedAs: 'public' | 'protected';
@@ -27,45 +29,44 @@ const ModelerShareModalOptionPublicLink = ({
 }: ModelerShareModalOptionPublicLinkProps) => {
   const { processId } = useParams();
   const query = useSearchParams();
-  const [selectedVersionId, setSelectedVersionId] = useState<string | null>(query.get('version'));
+  const [selectedVersionId, setSelectedVersionId] = useState<string | null>(() => {
+    const queryVersion = query.get('version');
+    if (queryVersion && processVersions.find((version) => version.id === queryVersion))
+      return queryVersion;
+    else return processVersions[0]?.id;
+  });
   const environment = useEnvironment();
 
   const [shareLink, setShareLink] = useState('');
   const [registeredUsersonlyChecked, setRegisteredUsersonlyChecked] = useState(
     sharedAs === 'protected',
   );
-
-  const { message } = App.useApp();
+  const app = App.useApp();
 
   const isShareLinkChecked = shareTimestamp > 0;
   const isShareLinkEmpty = shareLink.length === 0;
 
   useEffect(() => {
-    const generateProcessShareUrlFromOldTimestamp = async () => {
-      try {
-        // generate an url with a token that contains the currently active sharing timestamp
-        const url = await generateSharedViewerUrl(
-          { processId, timestamp: shareTimestamp },
-          selectedVersionId || undefined,
-        );
-        setShareLink(url);
-      } catch (error) {
-        console.error('Error while generating the url for sharing:', error);
-      }
-    };
-
     if (isShareLinkChecked) {
-      generateProcessShareUrlFromOldTimestamp();
+      wrapServerCall({
+        fn: () =>
+          generateSharedViewerUrl(
+            { processId, timestamp: shareTimestamp },
+            selectedVersionId || undefined,
+          ),
+        onSuccess: (url) => setShareLink(url),
+        app,
+      });
     }
     setRegisteredUsersonlyChecked(sharedAs === 'protected');
-  }, [sharedAs, shareTimestamp, processId, selectedVersionId, isShareLinkChecked]);
+  }, [sharedAs, shareTimestamp, processId, selectedVersionId, isShareLinkChecked, app]);
 
   const handleCopyLink = async () => {
     try {
       await navigator.clipboard.writeText(shareLink);
-      message.success('Link Copied');
+      app.message.success('Link Copied');
     } catch (err) {
-      message.error('Error copying link');
+      app.message.error('Error copying link');
     }
   };
 
@@ -93,38 +94,47 @@ const ModelerShareModalOptionPublicLink = ({
     const isChecked = e.target.checked;
 
     if (isChecked) {
-      try {
-        const timestamp = Date.now();
-        // generate an url containing a token with the newly generated timestamp
-        const url = await generateSharedViewerUrl(
-          { processId: processId, timestamp },
-          // if there is a specific process version open in the modeler then link to that version (otherwise latest will be shown)
-          selectedVersionId || undefined,
-        );
-        setShareLink(url);
-        // activate sharing for that specific timestamp
-        await updateProcessGuestAccessRights(
-          processId,
-          {
-            sharedAs: 'public',
-            shareTimestamp: timestamp,
-          },
-          environment.spaceId,
-        );
-        message.success('Process shared');
-      } catch (err) {
-        message.error('Failed to share the process.');
-      }
+      // share process
+      const timestamp = Date.now();
+      await wrapServerCall({
+        fn: async () => {
+          const url = generateSharedViewerUrl(
+            { processId: processId, timestamp },
+            // if there is a specific process version open in the modeler then link to that version (otherwise latest will be shown)
+            selectedVersionId || undefined,
+          );
+          if (isUserErrorResponse(url)) return url;
+
+          const updateRightsResult = await updateProcessGuestAccessRights(
+            processId,
+            {
+              sharedAs: 'public',
+              shareTimestamp: timestamp,
+            },
+            environment.spaceId,
+          );
+          if (isUserErrorResponse(updateRightsResult)) return updateRightsResult;
+
+          return url;
+        },
+        onSuccess: (url) => {
+          setShareLink(url);
+          app.message.success('Process shared');
+        },
+        app,
+      });
     } else {
       // deactivate sharing
-      try {
-        await updateProcessGuestAccessRights(processId, { shareTimestamp: 0 }, environment.spaceId);
-        setRegisteredUsersonlyChecked(false);
-        setShareLink('');
-        message.success('Process unshared');
-      } catch (err) {
-        message.error('Encountered an error while trying to stop sharing the process.');
-      }
+      await wrapServerCall({
+        fn: () =>
+          updateProcessGuestAccessRights(processId, { shareTimestamp: 0 }, environment.spaceId),
+        onSuccess: () => {
+          setRegisteredUsersonlyChecked(false);
+          setShareLink('');
+          app.message.success('Process unshared');
+        },
+        app,
+      });
     }
     refresh();
   };
@@ -156,7 +166,7 @@ const ModelerShareModalOptionPublicLink = ({
       if (action === 'copy') {
         const item = new ClipboardItem({ 'image/png': getQRCodeBlob() });
         await navigator.clipboard.write([item]);
-        message.success('QR Code copied as PNG');
+        app.message.success('QR Code copied as PNG');
       } else if (action === 'download') {
         const a = document.createElement('a');
         a.href = URL.createObjectURL(await getQRCodeBlob());
@@ -166,24 +176,22 @@ const ModelerShareModalOptionPublicLink = ({
         throw new Error('Invalid action specified');
       }
     } catch (err: any) {
-      if (err instanceof ReferenceError) message.info(`ClipboardAPI not supported in your browser`);
-      else message.error(`${err}`);
+      if (err instanceof ReferenceError)
+        app.message.info(`ClipboardAPI not supported in your browser`);
+      else app.message.error(`${err}`);
     }
   };
 
   const handleOpenSharedPage = async () => {
     if (shareTimestamp) {
-      try {
-        const url = await generateSharedViewerUrl(
-          { processId, timestamp: shareTimestamp },
-          selectedVersionId || undefined,
-        );
-
-        // open the documentation page in a new tab (unless it is already open in which case just show the tab)
-        window.open(url, `${processId}-${selectedVersionId}-tab`);
-      } catch (err) {
-        message.error('Failed to open the documentation page.');
-      }
+      await wrapServerCall({
+        fn: () =>
+          generateSharedViewerUrl(
+            { processId, timestamp: shareTimestamp },
+            selectedVersionId || undefined,
+          ),
+        onSuccess: (url) => window.open(url, `${processId}-${selectedVersionId}-tab`),
+      });
     }
   };
 
diff --git a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal.tsx b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal.tsx
index 7684eb543..7496d92df 100644
--- a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal.tsx
+++ b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-share-modal.tsx
@@ -26,6 +26,8 @@ import { getProcess } from '@/lib/data/processes';
 import { Process, ProcessMetadata } from '@/lib/data/process-schema';
 import { useEnvironment } from '@/components/auth-can';
 import { useAddControlCallback } from '@/lib/controls-store';
+import { wrapServerCall } from '@/lib/wrap-server-call';
+import { isUserErrorResponse } from '@/lib/user-error';
 
 type ShareModalProps = {
   onExport: () => void;
@@ -50,7 +52,7 @@ const ModelerShareModalButton: FC<ShareModalProps> = ({
   const [shareToken, setShareToken] = useState('');
   const [shareTimestamp, setShareTimestamp] = useState(0);
   const [allowIframeTimestamp, setAllowIframeTimestamp] = useState(0);
-  const { message } = App.useApp();
+  const app = App.useApp();
   const [processData, setProcessData] = useState<Omit<ProcessMetadata, 'bpmn'>>();
   const [checkingIfProcessShared, setCheckingIfProcessShared] = useState(false);
 
@@ -92,7 +94,7 @@ const ModelerShareModalButton: FC<ShareModalProps> = ({
       const xml = await modeler.getXML();
       if (xml) {
         navigator.clipboard.writeText(xml);
-        message.success('Copied to clipboard');
+        app.message.success('Copied to clipboard');
       }
     }
   };
@@ -110,41 +112,49 @@ const ModelerShareModalButton: FC<ShareModalProps> = ({
   };
 
   const handleShareMobile = async (sharedAs: 'public' | 'protected') => {
-    let link: string;
-    try {
-      let timestamp = shareTimestamp ? shareTimestamp : Date.now();
+    let url: string | null = null;
+    let timestamp = shareTimestamp ? shareTimestamp : Date.now();
+    await wrapServerCall({
+      fn: async () => {
+        const url = await generateSharedViewerUrl({
+          processId,
+          timestamp,
+        });
+        if (isUserErrorResponse(url)) return url;
 
-      link = await generateSharedViewerUrl({ processId, timestamp });
-      await updateProcessGuestAccessRights(
-        processId,
-        {
-          sharedAs: sharedAs,
-          shareTimestamp: timestamp,
-        },
-        environment.spaceId,
-      );
-    } catch (err) {
-      message.error('Failed to generate the sharing url for the process.');
-      return;
-    }
+        const accessUpdateResult = await updateProcessGuestAccessRights(
+          processId,
+          {
+            sharedAs: 'public',
+            allowIframeTimestamp: timestamp,
+          },
+          environment.spaceId,
+        );
+        if (isUserErrorResponse(accessUpdateResult)) return accessUpdateResult;
 
-    const shareObject = {
-      title: `${processData?.name} | PROCEED`,
-      text: 'Here is a shared process for you',
-      url: `${link}`,
-    };
+        return url;
+      },
+      onSuccess: (url) => (url = url),
+      app,
+    });
+
+    if (!url) return;
 
     if (navigator.share) {
       try {
-        await navigator.share(shareObject);
+        await navigator.share({
+          title: `${processData?.name} | PROCEED`,
+          text: 'Here is a shared process for you',
+          url,
+        });
       } catch (err: any) {
         if (!err.toString().includes('AbortError')) {
           console.error(err);
         }
       }
     } else {
-      navigator.clipboard.writeText(shareObject.url);
-      message.success('Copied to clipboard');
+      navigator.clipboard.writeText(url);
+      app.message.success('Copied to clipboard');
     }
     checkIfProcessShared();
   };
@@ -190,10 +200,10 @@ const ModelerShareModalButton: FC<ShareModalProps> = ({
     async () => {
       setActiveIndex(2);
       try {
-        if (await copyProcessImage(modeler!)) message.success('Copied to clipboard');
-        else message.info('ClipboardAPI not supported in your browser');
+        if (await copyProcessImage(modeler!)) app.message.success('Copied to clipboard');
+        else app.message.info('ClipboardAPI not supported in your browser');
       } catch (err) {
-        message.error(`${err}`);
+        app.message.error(`${err}`);
       }
       setActiveIndex(null);
     },
@@ -301,6 +311,7 @@ const ModelerShareModalButton: FC<ShareModalProps> = ({
           sharedAs={sharedAs as SharedAsType}
           allowIframeTimestamp={allowIframeTimestamp}
           refresh={checkIfProcessShared}
+          processVersions={processVersions}
         />
       ),
     },
@@ -338,6 +349,7 @@ const ModelerShareModalButton: FC<ShareModalProps> = ({
             Close
           </Button>
         }
+        destroyOnClose
       >
         <Space
           style={{
diff --git a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-toolbar.tsx b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-toolbar.tsx
index 1babccc1b..eb7a09cfa 100644
--- a/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-toolbar.tsx
+++ b/src/management-system-v2/app/(dashboard)/[environmentId]/processes/[processId]/modeler-toolbar.tsx
@@ -32,6 +32,7 @@ import { isUserErrorResponse } from '@/lib/user-error';
 import UserTaskBuilder from './_user-task-builder';
 import ScriptEditor from '@/app/(dashboard)/[environmentId]/processes/[processId]/script-editor';
 import { EnvVarsContext } from '@/components/env-vars-context';
+import { wrapServerCall } from '@/lib/wrap-server-call';
 
 const LATEST_VERSION = { id: '-1', name: 'Latest Version', description: '' };
 
@@ -51,7 +52,8 @@ const ModelerToolbar = ({
 }: ModelerToolbarProps) => {
   const router = useRouter();
   const environment = useEnvironment();
-  const { message } = App.useApp();
+  const app = App.useApp();
+  const message = app.message;
   const env = use(EnvVarsContext);
 
   const [showPropertiesPanel, setShowPropertiesPanel] = useState(false);
@@ -194,21 +196,15 @@ const ModelerToolbar = ({
     }
   };
 
-  const handleOpenDocumentation = async () => {
+  const handleOpenDocumentation = () => {
     // the timestamp does not matter here since it is overridden by the user being an owner of the process
-    try {
-      const url = await generateSharedViewerUrl(
-        { processId, timestamp: 0 },
-        selectedVersionId || undefined,
-      );
-
-      // open the documentation page in a new tab (unless it is already open in which case just show the tab)
-      window.open(url, `${processId}-${selectedVersionId}-tab`);
-    } catch (err) {
-      message.error('Failed to open the documentation page.');
-    }
+    return wrapServerCall({
+      fn: () =>
+        generateSharedViewerUrl({ processId, timestamp: 0 }, selectedVersionId || undefined),
+      onSuccess: (url) => window.open(url, `${processId}-${selectedVersionId}-tab`),
+      app,
+    });
   };
-
   const filterOption: SelectProps['filterOption'] = (input, option) =>
     ((option?.label as string) ?? '').toLowerCase().includes(input.toLowerCase());
 
diff --git a/src/management-system-v2/components/process-export.tsx b/src/management-system-v2/components/process-export.tsx
index 86fa5854f..6af058342 100644
--- a/src/management-system-v2/components/process-export.tsx
+++ b/src/management-system-v2/components/process-export.tsx
@@ -14,6 +14,8 @@ import {
   settingsOptions as pdfOptions,
 } from '@/app/shared-viewer/settings-modal';
 import { generateSharedViewerUrl } from '@/lib/sharing/process-sharing';
+import { wrapServerCall } from '@/lib/wrap-server-call';
+import { useRouter } from 'next/navigation';
 
 const exportTypeOptions = [
   { label: 'BPMN', value: 'bpmn' },
@@ -98,6 +100,8 @@ const ProcessExportModal: React.FC<ProcessExportModalProps> = ({
   preselectedExportType,
   resetPreselectedExportType,
 }) => {
+  const router = useRouter();
+
   const [selectedType, setSelectedType] = useState<ProcessExportTypes | undefined>(
     preselectedExportType,
   );
@@ -135,18 +139,17 @@ const ProcessExportModal: React.FC<ProcessExportModalProps> = ({
     if (selectedType === 'pdf') {
       const { definitionId, processVersion } = processes[0];
 
-      // the timestamp does not matter here since it is overriden by the user being an owner of the process
-      const url = await generateSharedViewerUrl(
-        {
-          processId: definitionId,
-          timestamp: 0,
-        },
-        processVersion ? `${processVersion}` : undefined,
-        selectedOptions as string[],
-      );
-
-      // open the documentation page in a new tab (the print menu will be opened automatically)
-      window.open(url, `${definitionId}-${processVersion}-tab`);
+      // the timestamp does not matter here since it is overridden by the user being an owner of the process
+      await wrapServerCall({
+        fn: () =>
+          generateSharedViewerUrl(
+            { processId: definitionId, timestamp: 0 },
+            processVersion || undefined,
+            selectedOptions as string[],
+          ),
+        onSuccess: (url) =>
+          router.push(new URL(url, `${definitionId}-${processVersion}-tab`).toString()),
+      });
     } else {
       await exportProcesses(
         {
diff --git a/src/management-system-v2/lib/sharing/process-sharing.ts b/src/management-system-v2/lib/sharing/process-sharing.ts
index 75b44106f..be31910eb 100644
--- a/src/management-system-v2/lib/sharing/process-sharing.ts
+++ b/src/management-system-v2/lib/sharing/process-sharing.ts
@@ -7,7 +7,8 @@ import { Environment } from '../data/environment-schema';
 import { getUserOrganizationEnvironments, getEnvironmentById } from '@/lib/data/DTOs';
 import { env } from '@/lib/env-vars';
 import { asyncMap } from '../helpers/javascriptHelpers';
-import Ability, { UnauthorizedError } from '../ability/abilityHelper';
+import Ability from '../ability/abilityHelper';
+import { UserErrorType, userError } from '../user-error';
 
 export interface TokenPayload {
   processId: string | string[];
@@ -46,26 +47,33 @@ export async function generateSharedViewerUrl(
   version?: string,
   settings?: string[],
 ) {
-  const token = generateProcessShareToken(payload);
+  try {
+    if (payload.embeddedMode && !version)
+      return userError('A version is required for embedded mode', UserErrorType.ConstraintError);
 
-  const header = headers();
-  const host = header.get('host');
-  const scheme = header.get('referer')?.split('://')[0];
+    const token = generateProcessShareToken(payload);
 
-  const baseUrl = `${scheme}://${host}`;
-  let url = `${baseUrl}/shared-viewer?token=${token}`;
+    const header = headers();
+    const host = header.get('host');
+    const scheme = header.get('referer')?.split('://')[0];
 
-  if (version) {
-    url += `&version=${version}`;
-  }
+    const baseUrl = `${scheme}://${host}`;
+    let url = `${baseUrl}/shared-viewer?token=${token}`;
 
-  if (settings?.length) {
-    settings.forEach((option) => {
-      url += `&settings=${option}`;
-    });
-  }
+    if (version) {
+      url += `&version=${version}`;
+    }
 
-  return url;
+    if (settings?.length) {
+      settings.forEach((option) => {
+        url += `&settings=${option}`;
+      });
+    }
+
+    return url;
+  } catch (e) {
+    return userError('Something went wrong');
+  }
 }
 
 export async function getAllUserWorkspaces(userId: string, ability?: Ability) {
diff --git a/tests/ms2/processes/process-modeler/process-modeler.spec.ts b/tests/ms2/processes/process-modeler/process-modeler.spec.ts
index 2ce8a6280..31d5383bf 100644
--- a/tests/ms2/processes/process-modeler/process-modeler.spec.ts
+++ b/tests/ms2/processes/process-modeler/process-modeler.spec.ts
@@ -259,6 +259,25 @@ test('share-modal', async ({ processListPage, ms2Page }) => {
 
   await page.waitForURL(/processes\/[a-z0-9-_]+/);
 
+  // create new process version - Needed for embed
+  const openVersionCreationDialog = page
+    .getByLabel('general-modeler-toolbar')
+    .getByRole('button', { name: 'plus' });
+  let versionModal = await openModal(page, () => openVersionCreationDialog.click());
+  const versionCreationDialog = page.getByRole('dialog', {
+    name: 'Create New Version',
+  });
+  await expect(versionCreationDialog).toBeVisible();
+
+  // Fill version creation dialog and create new version
+  const versionCreationSubmitButton = versionModal.getByRole('button', {
+    name: 'Create Version',
+  });
+  await versionModal.getByPlaceholder('Version Name').fill('Version 1');
+  await versionModal.getByPlaceholder('Version Description').fill('description');
+  await closeModal(versionModal, () => versionCreationSubmitButton.click());
+
+  //Open share modal
   const modal = await openModal(page, () =>
     page.getByRole('button', { name: 'share-alt' }).click(),
   );
@@ -276,7 +295,7 @@ test('share-modal', async ({ processListPage, ms2Page }) => {
   clipboardData = await ms2Page.readClipboard(true);
 
   const regex =
-    /<iframe src='((http|https):\/\/[a-zA-Z0-9.:_-]+\/shared-viewer\?token=[a-zA-Z0-9._-]+)'/;
+    /<iframe src='((http|https):\/\/[a-zA-Z0-9.:_-]+\/shared-viewer\?token=[a-zA-Z0-9._-]+\&version=[a-zA-Z0-9._-]+)'/;
   expect(clipboardData).toMatch(regex);
 
   /*************************** Copy Diagram As PNG ********************************/