diff --git a/src/extensions/savetoLaserfiche/SaveToLaserficheDialog.tsx b/src/extensions/savetoLaserfiche/SaveToLaserficheDialog.tsx
index aec1fc3..b4bb9f7 100644
--- a/src/extensions/savetoLaserfiche/SaveToLaserficheDialog.tsx
+++ b/src/extensions/savetoLaserfiche/SaveToLaserficheDialog.tsx
@@ -22,10 +22,7 @@ import { SPComponentLoader } from '@microsoft/sp-loader';
 import * as ReactDOM from 'react-dom';
 import { BaseDialog } from '@microsoft/sp-dialog';
 import { getRegion } from '../../Utils/Funcs';
-import {
-  APIServerException,
-  Entry,
-} from '@laserfiche/lf-repository-api-client';
+import { Entry } from '@laserfiche/lf-repository-api-client';
 import { RepositoryClientExInternal } from '../../repository-client/repository-client';
 import { IRepositoryApiClientExInternal } from '../../repository-client/repository-client-types';
 import { PathUtils } from '@laserfiche/lf-js-utils';
@@ -76,7 +73,8 @@ export default class SaveToLaserficheCustomDialog extends BaseDialog {
   }
 }
 
-const ENTRY_WITH_SAME_NAME_EXISTS_IN_FOLDER_IF_CONTINUE_LF_WILL_RENAME = 'An entry with the same name already exists in the specified folder. If you continue, Laserfiche will automatically rename the new document.';
+const ENTRY_WITH_SAME_NAME_EXISTS_IN_FOLDER_IF_CONTINUE_LF_WILL_RENAME =
+  'An entry with the same name already exists in the specified folder. If you continue, Laserfiche will automatically rename the new document.';
 function SaveToLaserficheDialog(props: {
   isSuccessfulLoggedIn: (success: boolean) => void;
   closeClick: (success?: SavedToLaserficheDocumentData) => Promise<void>;
@@ -112,9 +110,9 @@ function SaveToLaserficheDialog(props: {
 
   React.useEffect(() => {
     const initializeComponentAsync: () => Promise<void> = async () => {
+      await SPComponentLoader.loadScript(ZONE_JS_URL);
+      await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
       try {
-        await SPComponentLoader.loadScript(ZONE_JS_URL);
-        await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
         if (loginComponent.current?.authorization_credentials) {
           const validRepoClient = await tryGetValidRepositoryClientAsync();
           const saveToLF = new SaveDocumentToLaserfiche(
@@ -129,13 +127,14 @@ function SaveToLaserficheDialog(props: {
                   repoId,
                   entryId: Number.parseInt(props.spFileMetadata.entryId, 10),
                 });
-              const entryWithPathExists = validRepoClient.entriesClient.getEntryByPath({
-                repoId,
-                fullPath: PathUtils.combinePaths(
-                  entryInfo.fullPath,
-                  props.spFileMetadata.fileName
-                ),
-              });
+              const entryWithPathExists =
+                await validRepoClient.entriesClient.getEntryByPath({
+                  repoId,
+                  fullPath: PathUtils.combinePaths(
+                    entryInfo.fullPath,
+                    PathUtils.removeFileExtension(props.spFileMetadata.fileName)
+                  ),
+                });
               if (entryWithPathExists) {
                 setShowSaveTo(false);
                 const confirmSave = await getConfirmation(
@@ -151,11 +150,10 @@ function SaveToLaserficheDialog(props: {
                 }
               }
             } catch (err) {
-              const docDoesNotAlreadyExists = (err as APIServerException).statusCode === 404;
+              const docDoesNotAlreadyExists = err.status === 404;
               if (docDoesNotAlreadyExists) {
                 await continueSavingDocumentAsync(saveToLF);
-              }
-              else {
+              } else {
                 throw err;
               }
             }
diff --git a/src/webparts/LaserficheRepositoryAccessWebPart/components/LaserficheRepositoryAccessWebPart.tsx b/src/webparts/LaserficheRepositoryAccessWebPart/components/LaserficheRepositoryAccessWebPart.tsx
index f6333fd..9f21227 100644
--- a/src/webparts/LaserficheRepositoryAccessWebPart/components/LaserficheRepositoryAccessWebPart.tsx
+++ b/src/webparts/LaserficheRepositoryAccessWebPart/components/LaserficheRepositoryAccessWebPart.tsx
@@ -88,11 +88,11 @@ export default function LaserficheRepositoryAccessWebPart(
       };
 
     const initializeComponentAsync: () => Promise<void> = async () => {
+      await SPComponentLoader.loadScript(ZONE_JS_URL);
+      await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
+      SPComponentLoader.loadCss(LF_INDIGO_PINK_CSS_URL);
+      SPComponentLoader.loadCss(LF_MS_OFFICE_LITE_CSS_URL);
       try {
-        await SPComponentLoader.loadScript(ZONE_JS_URL);
-        await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
-        SPComponentLoader.loadCss(LF_INDIGO_PINK_CSS_URL);
-        SPComponentLoader.loadCss(LF_MS_OFFICE_LITE_CSS_URL);
         const loginCompleted: () => Promise<void> = async () => {
           await getAndInitializeRepositoryClientAndServicesAsync();
           setLoggedIn(true);
@@ -176,15 +176,15 @@ export default function LaserficheRepositoryAccessWebPart(
           </button>
         </div>
         {messageErrorModal !== undefined && (
-            <div
-              className={styles.modal}
-              id='messageErrorModal'
-              data-backdrop='static'
-              data-keyboard='false'
-            >
-              {messageErrorModal}
-            </div>
-          )}
+          <div
+            className={styles.modal}
+            id='messageErrorModal'
+            data-backdrop='static'
+            data-keyboard='false'
+          >
+            {messageErrorModal}
+          </div>
+        )}
         <RepositoryViewComponent
           webClientUrl={webClientUrl}
           repoClient={repoClient}
diff --git a/src/webparts/LaserficheRepositoryAccessWebPart/components/RepositoryViewWebPart.tsx b/src/webparts/LaserficheRepositoryAccessWebPart/components/RepositoryViewWebPart.tsx
index 3dd1ae5..5fd567d 100644
--- a/src/webparts/LaserficheRepositoryAccessWebPart/components/RepositoryViewWebPart.tsx
+++ b/src/webparts/LaserficheRepositoryAccessWebPart/components/RepositoryViewWebPart.tsx
@@ -9,7 +9,6 @@ import {
   PostEntryWithEdocMetadataRequest,
   PutFieldValsRequest,
   FileParameter,
-  APIServerException,
 } from '@laserfiche/lf-repository-api-client';
 import {
   LfRepoTreeNodeService,
@@ -388,7 +387,8 @@ function RepositoryBrowserToolbar(props: {
   );
 }
 
-const ENTRY_WITH_SAME_NAME_EXISTS_IN_FOLDER_IF_CONTINUE_LF_WILL_RENAME = 'An entry with the same name already exists in the specified folder. If you continue, Laserfiche will automatically rename the new document.';
+const ENTRY_WITH_SAME_NAME_EXISTS_IN_FOLDER_IF_CONTINUE_LF_WILL_RENAME =
+  'An entry with the same name already exists in the specified folder. If you continue, Laserfiche will automatically rename the new document.';
 function ImportFileModal(props: {
   repoClient: IRepositoryApiClientExInternal;
   loggedIn: boolean;
@@ -467,10 +467,11 @@ function ImportFileModal(props: {
       const renamedFile = new File([fileData], fileName + extension);
       const fileContainsBacklash = fileName.includes('\\');
       try {
-        const entryWithPathExists = await props.repoClient.entriesClient.getEntryByPath({
-          repoId,
-          fullPath: PathUtils.combinePaths(props.parentItem.path, fileName),
-        });
+        const entryWithPathExists =
+          await props.repoClient.entriesClient.getEntryByPath({
+            repoId,
+            fullPath: PathUtils.combinePaths(props.parentItem.path, fileName),
+          });
         if (entryWithPathExists) {
           setShowImport(false);
           const confirmUpload = await getConfirmation(
@@ -485,10 +486,10 @@ function ImportFileModal(props: {
           }
         }
       } catch (err) {
-        if ((err as APIServerException).statusCode === 404) {
+        const docDoesNotAlreadyExists = err.status === 404;
+        if (docDoesNotAlreadyExists) {
           // doesn't exist, good to go
-        }
-        else {
+        } else {
           throw err;
         }
       }
diff --git a/src/webparts/laserficheAdminConfiguration/components/LaserficheAdminConfiguration.tsx b/src/webparts/laserficheAdminConfiguration/components/LaserficheAdminConfiguration.tsx
index 5185b21..a8244e8 100644
--- a/src/webparts/laserficheAdminConfiguration/components/LaserficheAdminConfiguration.tsx
+++ b/src/webparts/laserficheAdminConfiguration/components/LaserficheAdminConfiguration.tsx
@@ -80,11 +80,11 @@ export default function LaserficheAdminConfiguration(
 
   React.useEffect(() => {
     const initializeComponentAsync: () => Promise<void> = async () => {
+      SPComponentLoader.loadCss(LF_INDIGO_PINK_CSS_URL);
+      SPComponentLoader.loadCss(LF_MS_OFFICE_LITE_CSS_URL);
+      await SPComponentLoader.loadScript(ZONE_JS_URL);
+      await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
       try {
-        SPComponentLoader.loadCss(LF_INDIGO_PINK_CSS_URL);
-        SPComponentLoader.loadCss(LF_MS_OFFICE_LITE_CSS_URL);
-        await SPComponentLoader.loadScript(ZONE_JS_URL);
-        await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
         const loginCompleted: () => Promise<void> = async () => {
           await getAndInitializeRepositoryClientAndServicesAsync();
           setLoggedIn(true);
diff --git a/src/webparts/sendToLaserficheLoginComponent/components/SendToLaserficheLoginComponent.tsx b/src/webparts/sendToLaserficheLoginComponent/components/SendToLaserficheLoginComponent.tsx
index 3b1ad79..9a184fd 100644
--- a/src/webparts/sendToLaserficheLoginComponent/components/SendToLaserficheLoginComponent.tsx
+++ b/src/webparts/sendToLaserficheLoginComponent/components/SendToLaserficheLoginComponent.tsx
@@ -136,16 +136,16 @@ export default function SendToLaserficheLoginComponent(
     };
 
     const setUpLoginComponentAsync: () => Promise<void> = async () => {
-      try {
-        SPComponentLoader.loadCss(LF_INDIGO_PINK_CSS_URL);
-        SPComponentLoader.loadCss(LF_MS_OFFICE_LITE_CSS_URL);
-        loginComponent.current.addEventListener(
-          'logoutCompleted',
-          logoutCompletedInPopup
-        );
-        await SPComponentLoader.loadScript(ZONE_JS_URL);
-        await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
+      SPComponentLoader.loadCss(LF_INDIGO_PINK_CSS_URL);
+      SPComponentLoader.loadCss(LF_MS_OFFICE_LITE_CSS_URL);
+      loginComponent.current.addEventListener(
+        'logoutCompleted',
+        logoutCompletedInPopup
+      );
+      await SPComponentLoader.loadScript(ZONE_JS_URL);
+      await SPComponentLoader.loadScript(LF_UI_COMPONENTS_URL);
 
+      try {
         if (window.location.href.includes('autologin')) {
           document.body.style.display = 'none';
           await handleLoginOrLogoutInPopupAsync();