diff --git a/package-lock.json b/package-lock.json
index 360146e2..9f0dfaaf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@blueprintjs/icons": "^4.16.0",
         "@blueprintjs/popover2": "^1.14.11",
         "@buttercup/channel-queue": "^1.4.0",
-        "@buttercup/locust": "^2.2.0",
+        "@buttercup/locust": "^2.2.1",
         "@buttercup/ui": "^6.2.2",
         "@types/chrome": "^0.0.251",
         "@types/ms": "^0.7.34",
@@ -2059,9 +2059,9 @@
       }
     },
     "node_modules/@buttercup/locust": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@buttercup/locust/-/locust-2.2.0.tgz",
-      "integrity": "sha512-weT3huHJNwK+sTr/0TRUrRgpw1TE/sZ6DM8hoieURT818/HVITMpuMe5qwWtYrJIOISyY25tAKPKkp1KBImgyA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@buttercup/locust/-/locust-2.2.1.tgz",
+      "integrity": "sha512-tBOCS8bfuG2fGByTPR5V0EhQGieq4ewRHnfKlwzFsF3ZUKzc6/OvzKeH8JlmCnj90Y8nj4G3DDipMnbdv93a9g==",
       "dev": true,
       "dependencies": {
         "eventemitter3": "^5.0.1",
@@ -16234,9 +16234,9 @@
       }
     },
     "@buttercup/locust": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@buttercup/locust/-/locust-2.2.0.tgz",
-      "integrity": "sha512-weT3huHJNwK+sTr/0TRUrRgpw1TE/sZ6DM8hoieURT818/HVITMpuMe5qwWtYrJIOISyY25tAKPKkp1KBImgyA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@buttercup/locust/-/locust-2.2.1.tgz",
+      "integrity": "sha512-tBOCS8bfuG2fGByTPR5V0EhQGieq4ewRHnfKlwzFsF3ZUKzc6/OvzKeH8JlmCnj90Y8nj4G3DDipMnbdv93a9g==",
       "dev": true,
       "requires": {
         "eventemitter3": "^5.0.1",
diff --git a/package.json b/package.json
index 9e3217bb..e4bb0578 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@blueprintjs/icons": "^4.16.0",
     "@blueprintjs/popover2": "^1.14.11",
     "@buttercup/channel-queue": "^1.4.0",
-    "@buttercup/locust": "^2.2.0",
+    "@buttercup/locust": "^2.2.1",
     "@buttercup/ui": "^6.2.2",
     "@types/chrome": "^0.0.251",
     "@types/ms": "^0.7.34",
diff --git a/source/background/services/cryptoKeys.ts b/source/background/services/cryptoKeys.ts
index 8b6d2fb5..ec180cbc 100644
--- a/source/background/services/cryptoKeys.ts
+++ b/source/background/services/cryptoKeys.ts
@@ -52,8 +52,12 @@ export async function deriveSecretKey(privateKey: CryptoKey, publicKey: CryptoKe
 }
 
 async function exportECDHKey(key: CryptoKey): Promise<string> {
-    const exported = await window.crypto.subtle.exportKey("jwk", key);
-    return JSON.stringify(exported);
+    try {
+        const exported = await window.crypto.subtle.exportKey("jwk", key);
+        return JSON.stringify(exported);
+    } catch (err) {
+        throw new Layerr(err, "Failed exporting ECDH key");
+    }
 }
 
 export async function generateKeys(): Promise<void> {
@@ -73,7 +77,12 @@ export async function generateKeys(): Promise<void> {
 }
 
 export async function importECDHKey(key: string): Promise<CryptoKey> {
-    const jwk = JSON.parse(key) as JsonWebKey;
+    let jwk: JsonWebKey;
+    try {
+        jwk = JSON.parse(key) as JsonWebKey;
+    } catch (err) {
+        throw new Layerr(err, "Failed importing ECDH key");
+    }
     const usages: Array<KeyUsage> = jwk.key_ops && jwk.key_ops.includes("deriveKey") ? ["deriveKey"] : [];
     return window.crypto.subtle.importKey(
         "jwk",
diff --git a/source/popup/components/entries/EntryInfoDialog.tsx b/source/popup/components/entries/EntryInfoDialog.tsx
new file mode 100644
index 00000000..95b527e0
--- /dev/null
+++ b/source/popup/components/entries/EntryInfoDialog.tsx
@@ -0,0 +1,126 @@
+import React, { useCallback, useMemo } from "react";
+import { Button, Classes, Dialog, DialogBody, InputGroup, Intent } from "@blueprintjs/core";
+import { SearchResult } from "buttercup";
+import cn from "classnames";
+import styled from "styled-components";
+import { t } from "../../../shared/i18n/trans.js";
+import { copyTextToClipboard } from "../../services/clipboard.js";
+import { getToaster } from "../../../shared/services/notifications.js";
+import { localisedErrorMessage } from "../../../shared/library/error.js";
+
+interface EntryInfoDialogProps {
+    entry: SearchResult | null;
+    onClose: () => void;
+}
+
+interface EntryProperty {
+    key: string;
+    sensitive: boolean;
+    title: string;
+    value: string;
+}
+
+const InfoDialog = styled(Dialog)`
+    max-width: 90%;
+`;
+const InfoDialogBody = styled(DialogBody)`
+    display: flex;
+    flex-direction: row;
+    justify-content: stretch;
+    align-items: flex-start;
+    overflow-x: hidden;
+`;
+const InfoTable = styled.table`
+    table-layout: fixed;
+    width: 100%;
+`;
+
+export function EntryInfoDialog(props: EntryInfoDialogProps) {
+    const { entry, onClose } = props;
+    const properties = useMemo(() => entry ? orderProperties(entry.properties) : [], [entry]);
+    const handleCopyClick = useCallback(async (property: string, value: string) => {
+        try {
+            await copyTextToClipboard(value);
+            getToaster().show({
+                intent: Intent.SUCCESS,
+                message: t("popup.entries.info.copy-success", { property }),
+                timeout: 4000
+            });
+        } catch (err) {
+            getToaster().show({
+                intent: Intent.DANGER,
+                message: t("popup.entries.info.copy-error", { message: localisedErrorMessage(err) }),
+                timeout: 10000
+            });
+        }
+    }, []);
+    return (
+        <InfoDialog
+            icon="info-sign"
+            isCloseButtonShown
+            isOpen={!!entry}
+            onClose={onClose}
+            title={entry?.properties.title ?? "Untitled Entry"}
+        >
+            <InfoDialogBody>
+                <InfoTable className={cn(Classes.HTML_TABLE, Classes.COMPACT, Classes.HTML_TABLE_STRIPED)}>
+                    <tbody>
+                        {properties.map(property => (
+                            <tr key={property.key}>
+                                <td style={{ width: "100%" }}>
+                                    {property.title}<br />
+                                    <InputGroup
+                                        type={property.sensitive ? "password" : "text"}
+                                        value={property.value}
+                                        readOnly
+                                        rightElement={
+                                            <Button
+                                                icon="clipboard"
+                                                minimal
+                                                onClick={() => handleCopyClick(property.title, property.value)}
+                                                title={t("popup.entries.info.copy-tooltip")}
+                                            />
+                                        }
+                                    />
+                                </td>
+                            </tr>
+                        ))}
+                    </tbody>
+                </InfoTable>
+            </InfoDialogBody>
+        </InfoDialog>
+    );
+}
+
+function orderProperties(properties: Record<string, string>): Array<EntryProperty> {
+    const working = { ...properties };
+    delete working["title"];
+    const output: Array<EntryProperty> = [];
+    if (working["username"]) {
+        output.push({
+            key: "username",
+            sensitive: false,
+            title: "Username",
+            value: properties["username"]
+        });
+        delete working["username"];
+    }
+    if (working["password"]) {
+        output.push({
+            key: "password",
+            sensitive: true,
+            title: "Password",
+            value: properties["password"]
+        });
+        delete working["password"];
+    }
+    for (const prop in working) {
+        output.push({
+            key: prop,
+            sensitive: false,
+            title: prop,
+            value: working[prop]
+        });
+    }
+    return output;
+}
diff --git a/source/popup/components/entries/EntryItem.tsx b/source/popup/components/entries/EntryItem.tsx
index cd5d4c59..3053c228 100644
--- a/source/popup/components/entries/EntryItem.tsx
+++ b/source/popup/components/entries/EntryItem.tsx
@@ -14,6 +14,7 @@ interface EntryItemProps {
     fetchIcons: boolean;
     onAutoClick: () => void;
     onClick: () => void;
+    onInfoClick: () => void;
 }
 
 const CenteredText = styled(Text)`
@@ -66,7 +67,8 @@ export function EntryItem(props: EntryItemProps) {
         entry,
         fetchIcons,
         onAutoClick,
-        onClick
+        onClick,
+        onInfoClick
     } = props;
     const { source: popupSource } = useContext(LaunchContext);
     const entryDomain = useMemo(() => {
@@ -91,6 +93,11 @@ export function EntryItem(props: EntryItemProps) {
         },
         [onAutoClick]
     );
+    const handleEntryInfoClick = useCallback((evt: MouseEvent) => {
+        evt.preventDefault();
+        evt.stopPropagation();
+        onInfoClick();
+    }, [onInfoClick]);
     return (
         <Container isActive={false} onClick={handleEntryClick}>
             <EntryRow>
@@ -119,6 +126,15 @@ export function EntryItem(props: EntryItemProps) {
                                 onClick={handleEntryLoginClick}
                             />
                         </Tooltip2>
+                        <Tooltip2
+                            content={t("popup.entries.info.tooltip")}
+                        >
+                            <Button
+                                icon="info-sign"
+                                minimal
+                                onClick={handleEntryInfoClick}
+                            />
+                        </Tooltip2>
                     </ButtonGroup>
                 )}
             </EntryRow>
diff --git a/source/popup/components/entries/EntryItemList.tsx b/source/popup/components/entries/EntryItemList.tsx
index bca6e239..2166dca9 100644
--- a/source/popup/components/entries/EntryItemList.tsx
+++ b/source/popup/components/entries/EntryItemList.tsx
@@ -10,6 +10,7 @@ interface EntryItemListProps {
     entries: Array<SearchResult> | Record<string, Array<SearchResult>>;
     onEntryAutoClick: (entry: SearchResult) => void;
     onEntryClick: (entry: SearchResult) => void;
+    onEntryInfoClick: (entry: SearchResult) => void;
 }
 
 const ScrollList = styled.div`
@@ -21,7 +22,7 @@ const ScrollList = styled.div`
 `;
 
 export function EntryItemList(props: EntryItemListProps) {
-    const { entries, onEntryAutoClick, onEntryClick } = props;
+    const { entries, onEntryAutoClick, onEntryClick, onEntryInfoClick } = props;
     const [config] = useConfig();
     if (!config) return null;
     return (
@@ -35,6 +36,7 @@ export function EntryItemList(props: EntryItemListProps) {
                                 fetchIcons={config.entryIcons}
                                 onAutoClick={() => onEntryAutoClick(entry)}
                                 onClick={() => onEntryClick(entry)}
+                                onInfoClick={() => onEntryInfoClick(entry)}
                             />
                             <Divider />
                         </Fragment>
@@ -54,6 +56,7 @@ export function EntryItemList(props: EntryItemListProps) {
                                                 fetchIcons={config.entryIcons}
                                                 onAutoClick={() => onEntryAutoClick(entry)}
                                                 onClick={() => onEntryClick(entry)}
+                                                onInfoClick={() => onEntryInfoClick(entry)}
                                             />
                                             <Divider />
                                         </Fragment>
diff --git a/source/popup/components/otps/OTPItem.tsx b/source/popup/components/otps/OTPItem.tsx
index 3411d993..9aef20e7 100644
--- a/source/popup/components/otps/OTPItem.tsx
+++ b/source/popup/components/otps/OTPItem.tsx
@@ -83,11 +83,19 @@ export function OTPItem(props: OTPItemProps) {
         onClick();
     }, [onClick]);
     const [codeFirst, codeSecond] = useMemo(() => {
+        if (otp.errored) return [otp.digits, ""];
         return otp.digits.length === 8
             ? [otp.digits.substring(0, 4), otp.digits.substring(4)]
             : [otp.digits.substring(0, 3), otp.digits.substring(3)]
     }, [otp.digits]);
-    const spinnerLeft = otp.remaining / otp.period;
+    const spinnerLeft = useMemo(() => {
+        if (otp.errored) return 1;
+        return otp.remaining / otp.period;
+    }, [otp]);
+    const spinnerIntent = useMemo(() => {
+        if (otp.errored) return Intent.DANGER;
+        return spinnerLeft < 0.15 ? Intent.DANGER : spinnerLeft < 0.35 ? Intent.WARNING : Intent.SUCCESS;
+    }, [otp.errored, spinnerLeft]);
     return (
         <Container isActive={false} onClick={handleOTPClick}>
             <OTPRow>
@@ -102,15 +110,13 @@ export function OTPItem(props: OTPItemProps) {
                     </Title>
                     <CenteredText ellipsize className={cn(Classes.TEXT_SMALL, Classes.TEXT_MUTED)}>
                         {otp.entryTitle}
-                        {/* {t(`vault-state.${vault.state}`)} */}
-                        {/* Test Test Test */}
                     </CenteredText>
                 </DetailRow>
                 <OTPCode>
                     <Spinner
                         size={19}
                         value={spinnerLeft}
-                        intent={spinnerLeft < 0.15 ? Intent.DANGER : spinnerLeft < 0.35 ? Intent.WARNING : Intent.SUCCESS}
+                        intent={spinnerIntent}
                     />
                     <OTPCodePart>{codeFirst}</OTPCodePart>
                     <OTPCodePart>{codeSecond}</OTPCodePart>
diff --git a/source/popup/components/pages/EntriesPage.tsx b/source/popup/components/pages/EntriesPage.tsx
index 275ec1ae..fc9c95fc 100644
--- a/source/popup/components/pages/EntriesPage.tsx
+++ b/source/popup/components/pages/EntriesPage.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useMemo } from "react";
+import React, { useCallback, useContext, useMemo, useState } from "react";
 import styled from "styled-components";
 import { Button, InputGroup, Intent, NonIdealState, Spinner } from "@blueprintjs/core";
 import { SearchResult, VaultSourceStatus } from "buttercup";
@@ -12,6 +12,7 @@ import { getToaster } from "../../../shared/services/notifications.js";
 import { localisedErrorMessage } from "../../../shared/library/error.js";
 import { DesktopConnectionState } from "../../types.js";
 import { openPageForEntry } from "../../services/entry.js";
+import { EntryInfoDialog } from "../entries/EntryInfoDialog.js";
 
 interface EntriesPageProps {
     onConnectClick: () => Promise<void>;
@@ -91,6 +92,7 @@ function EntriesPageList(props: EntriesPageProps) {
     );
     const searchedEntries = useSearchedEntries(props.searchTerm);
     const { formID, source: popupSource, url } = useContext(LaunchContext);
+    const [selectedEntryInfo, setSelectedEntryInfo] = useState<SearchResult | null>(null);
     const urlEntries = useEntriesForURL(url);
     const recentEntries = useRecentEntries();
     const handleEntryClick = useCallback((entry: SearchResult, autoLogin: boolean) => {
@@ -131,42 +133,44 @@ function EntriesPageList(props: EntriesPageProps) {
     const handleEntryBodyClick = useCallback((entry: SearchResult) => {
         handleEntryClick(entry, false);
     }, [handleEntryClick]);
-    if (unlockedCount === 0) {
-        return (
-            <InvalidState
-                title={t("popup.all-locked.title")}
-                description={t("popup.all-locked.description")}
-                icon="folder-close"
-            />
-        );
-    }
-    if (searchedEntries.length > 0) {
-        return (
-            <EntryItemList
-                entries={searchedEntries}
-                onEntryAutoClick={handleEntryAutoLoginClick}
-                onEntryClick={handleEntryBodyClick}
-            />
-        );
-    }
-    if (urlEntries.length <= 0 && recentEntries.length <= 0) {
-        return (
-            <InvalidState
-                title={t("popup.no-entries.title")}
-                description={t("popup.no-entries.description")}
-                icon="clean"
-            />
-        );
-    }
+    const handleEntryInfoClick = useCallback((entry: SearchResult) => {
+        setSelectedEntryInfo(entry);
+    }, []);
+    // Render
     return (
-        <EntryItemList
-            entries={{
-                "URL Entries": urlEntries,
-                "Recents": recentEntries
-            }}
-            onEntryAutoClick={handleEntryAutoLoginClick}
-            onEntryClick={handleEntryBodyClick}
-        />
+        <>
+            {unlockedCount === 0 && (
+                <InvalidState
+                    title={t("popup.all-locked.title")}
+                    description={t("popup.all-locked.description")}
+                    icon="folder-close"
+                />
+            ) || searchedEntries.length > 0 && (
+                <EntryItemList
+                    entries={searchedEntries}
+                    onEntryAutoClick={handleEntryAutoLoginClick}
+                    onEntryClick={handleEntryBodyClick}
+                    onEntryInfoClick={handleEntryInfoClick}
+                />
+            ) || (urlEntries.length <= 0 && recentEntries.length <= 0) && (
+                <InvalidState
+                    title={t("popup.no-entries.title")}
+                    description={t("popup.no-entries.description")}
+                    icon="clean"
+                />
+            ) || (
+                <EntryItemList
+                    entries={{
+                        "URL Entries": urlEntries,
+                        "Recents": recentEntries
+                    }}
+                    onEntryAutoClick={handleEntryAutoLoginClick}
+                    onEntryClick={handleEntryBodyClick}
+                    onEntryInfoClick={handleEntryInfoClick}
+                />
+            )}
+            <EntryInfoDialog entry={selectedEntryInfo} onClose={() => setSelectedEntryInfo(null)} />
+        </>
     );
 }
 
diff --git a/source/popup/hooks/otp.ts b/source/popup/hooks/otp.ts
index 75d9cf0d..3bea1e49 100644
--- a/source/popup/hooks/otp.ts
+++ b/source/popup/hooks/otp.ts
@@ -1,10 +1,13 @@
 import * as OTPAuth from "otpauth";
+import { Layerr } from "layerr";
 import { useEffect, useMemo, useState } from "react";
-import { OTP } from "../types.js";
 import { useTimer } from "../../shared/hooks/timer.js";
+import { t } from "../../shared/i18n/trans.js";
+import { OTP } from "../types.js";
 
 export interface PreparedOTP extends OTP {
     digits: string;
+    errored: boolean;
     period: number;
     remaining: number;
 }
@@ -14,18 +17,23 @@ function getPeriodTimeLeft(period: number): number {
 }
 
 export function usePreparedOTPs(otps: Array<OTP>): Array<PreparedOTP> {
-    const [parsedOTPs, setParsedOTPs] = useState<Record<string, OTPAuth.TOTP>>({});
+    const [parsedOTPs, setParsedOTPs] = useState<Record<string, OTPAuth.TOTP | Error>>({});
     const [periods, setPeriods] = useState<Record<string, [number, number]>>({});
     useEffect(() => {
         const newParsed = { ...parsedOTPs };
         let changed = false;
         for (const otp of otps) {
             if (newParsed[otp.otpURL]) continue;
-            const otpInst = OTPAuth.URI.parse(otp.otpURL) as OTPAuth.TOTP;
-            if (!otpInst.period) {
-                throw new Error(`OTP is invalid (no period): ${otp.otpURL}`);
+            try {
+                const otpInst = OTPAuth.URI.parse(otp.otpURL) as OTPAuth.TOTP;
+                if (!otpInst.period) {
+                    throw new Error(`OTP is invalid (no period): ${otp.otpURL}`);
+                }
+                newParsed[otp.otpURL] = otpInst;
+            } catch (err) {
+                newParsed[otp.otpURL] = err;
+                console.error(err);
             }
-            newParsed[otp.otpURL] = otpInst;
             changed = true;
         }
         for (const parsed in newParsed) {
@@ -46,7 +54,13 @@ export function usePreparedOTPs(otps: Array<OTP>): Array<PreparedOTP> {
                 Object.keys(parsedOTPs).reduce(
                     (newPeriods, url) => ({
                         ...newPeriods,
-                        [url]: [parsedOTPs[url].period, getPeriodTimeLeft(parsedOTPs[url].period)]
+                        [url]:
+                            parsedOTPs[url] instanceof OTPAuth.TOTP
+                                ? [
+                                      (parsedOTPs[url] as OTPAuth.TOTP).period,
+                                      getPeriodTimeLeft((parsedOTPs[url] as OTPAuth.TOTP).period)
+                                  ]
+                                : [0, 0]
                     }),
                     {}
                 )
@@ -61,12 +75,25 @@ export function usePreparedOTPs(otps: Array<OTP>): Array<PreparedOTP> {
                 const parsed = parsedOTPs[otp.otpURL];
                 const periodInfo = periods[otp.otpURL];
                 if (!parsed || !Array.isArray(periodInfo)) return output;
+                let errored = false,
+                    code: string = "";
+                try {
+                    if (parsed instanceof Error) {
+                        throw new Layerr(parsed, "OTP was not parseable");
+                    }
+                    code = parsed.generate();
+                } catch (err) {
+                    console.error(err);
+                    code = t("popup.entries.otp.code-error");
+                    errored = true;
+                }
                 return [
                     ...output,
                     {
                         ...otp,
-                        otpTitle: parsed.label,
-                        digits: parsed.generate(),
+                        otpTitle: parsed instanceof OTPAuth.TOTP ? parsed.label : t("popup.entries.otp.label-error"),
+                        digits: code,
+                        errored,
                         period: periodInfo[0],
                         remaining: periodInfo[1]
                     }
diff --git a/source/popup/services/clipboard.ts b/source/popup/services/clipboard.ts
new file mode 100644
index 00000000..296f5f43
--- /dev/null
+++ b/source/popup/services/clipboard.ts
@@ -0,0 +1,24 @@
+import { Layerr } from "layerr";
+
+export async function copyTextToClipboard(text: string): Promise<void> {
+    // Navigator clipboard api needs a secure context (https)
+    if (navigator.clipboard && window.isSecureContext) {
+        await navigator.clipboard.writeText(text);
+    } else {
+        // Use the 'out of viewport hidden text area' trick
+        const textArea = document.createElement("textarea");
+        textArea.value = text;
+        // Move textarea out of the viewport so it's not visible
+        textArea.style.position = "absolute";
+        textArea.style.left = "-999999px";
+        document.body.prepend(textArea);
+        textArea.select();
+        try {
+            document.execCommand("copy");
+        } catch (error) {
+            throw new Layerr(error, "Failed copying text");
+        } finally {
+            textArea.remove();
+        }
+    }
+}
diff --git a/source/popup/services/tab.ts b/source/popup/services/tab.ts
index 5595eb2d..0166cce2 100644
--- a/source/popup/services/tab.ts
+++ b/source/popup/services/tab.ts
@@ -1,5 +1,9 @@
 import { SearchResult } from "buttercup";
+import { Intent } from "@blueprintjs/core";
 import { otpURIToDigits } from "../../shared/library/otp.js";
+import { getToaster } from "../../shared/services/notifications.js";
+import { localisedErrorMessage } from "../../shared/library/error.js";
+import { t } from "../../shared/i18n/trans.js";
 import { OTP, TabEvent, TabEventType } from "../types.js";
 
 export function sendEntryResultToTabForInput(formID: string, entry: SearchResult): void {
@@ -20,10 +24,21 @@ export function sendOTPToTabForInput(formID: string, otp: OTP): void {
     if (!formID) {
         throw new Error("No form ID found for dialog");
     }
+    let code: string = "";
+    try {
+        code = otpURIToDigits(otp.otpURL);
+    } catch (err) {
+        console.error(err);
+        getToaster().show({
+            intent: Intent.DANGER,
+            message: t("error.otp-generate", { message: localisedErrorMessage(err) }),
+            timeout: 10000
+        });
+    }
     sendTabEvent({
         formID,
         inputDetails: {
-            otp: otpURIToDigits(otp.otpURL)
+            otp: code
         },
         type: TabEventType.InputDetails
     });
diff --git a/source/shared/i18n/translations/en.json b/source/shared/i18n/translations/en.json
index 5042176d..2bfc5dfc 100644
--- a/source/shared/i18n/translations/en.json
+++ b/source/shared/i18n/translations/en.json
@@ -79,6 +79,7 @@
         },
         "fatal-boundary": "A fatal error has occurred - we're sorry this has happened. Please check out the details below in case they help diagnose the issue:",
         "generic": "Requested action failed: {{message}}",
+        "otp-generate": "Failed generating an OTP code for an OTP URI: {{message}}",
         "reset": "Failed resetting application settings: {{message}}"
     },
     "form": {
@@ -120,6 +121,16 @@
                 "open-error": "Could not open page for entry: {{message}}",
                 "recent-set-error": "Failed recording recent entry: {{message}}"
             },
+            "info": {
+                "copy-error": "Failed copying value: {{message}}",
+                "copy-success": "Copied value to clipboard: {{property}}",
+                "copy-tooltip": "Copy to clipoard",
+                "tooltip": "Show entry properties"
+            },
+            "otp": {
+                "code-error": "ERROR",
+                "label-error": "Bad OTP Item"
+            },
             "search": {
                 "button": "Search entries",
                 "placeholder": "Search..."
diff --git a/source/shared/library/otp.ts b/source/shared/library/otp.ts
index 1ce698c4..6d3ffa18 100644
--- a/source/shared/library/otp.ts
+++ b/source/shared/library/otp.ts
@@ -1,4 +1,5 @@
 import { SearchResult } from "buttercup";
+import { Layerr } from "layerr";
 import * as OTPAuth from "otpauth";
 
 function extractFirstOTPURI(entry: SearchResult): string | null {
@@ -14,8 +15,12 @@ function extractFirstOTPURI(entry: SearchResult): string | null {
 }
 
 export function otpURIToDigits(uri: string): string {
-    const otp = OTPAuth.URI.parse(uri);
-    return otp.generate();
+    try {
+        const otp = OTPAuth.URI.parse(uri);
+        return otp.generate();
+    } catch (err) {
+        throw new Layerr(err, "Failed generating OTP code for URI");
+    }
 }
 
 export function searchResultToOTP(entry: SearchResult): string | null {
diff --git a/source/shared/library/version.ts b/source/shared/library/version.ts
index 8ff964a9..e91a8a85 100644
--- a/source/shared/library/version.ts
+++ b/source/shared/library/version.ts
@@ -1,4 +1,4 @@
 // Do not edit this file - it is generated automatically at build time
 
-export const BUILD_DATE = "2024-03-26";
+export const BUILD_DATE = "2024-03-27";
 export const VERSION = "3.0.0";
diff --git a/source/shared/types.ts b/source/shared/types.ts
index e184f9ee..1ee1a83c 100644
--- a/source/shared/types.ts
+++ b/source/shared/types.ts
@@ -36,6 +36,7 @@ export interface BackgroundMessage {
     notification?: string;
     searchTerm?: string;
     sourceID?: VaultSourceID;
+    text?: string;
     type: BackgroundMessageType;
     url?: string;
 }