diff --git a/AcumaticaSmartsheetIntegration.zip b/AcumaticaSmartsheetIntegration.zip
index c14f74f..0881c13 100644
Binary files a/AcumaticaSmartsheetIntegration.zip and b/AcumaticaSmartsheetIntegration.zip differ
diff --git a/DeploymentSource/Bin/PX.SmartSheetIntegration.dll b/DeploymentSource/Bin/PX.SmartSheetIntegration.dll
index d6d8197..ed9c3e2 100644
Binary files a/DeploymentSource/Bin/PX.SmartSheetIntegration.dll and b/DeploymentSource/Bin/PX.SmartSheetIntegration.dll differ
diff --git a/DeploymentSource/Bin/PX.SmartSheetIntegration.pdb b/DeploymentSource/Bin/PX.SmartSheetIntegration.pdb
index 82916eb..4e19749 100644
Binary files a/DeploymentSource/Bin/PX.SmartSheetIntegration.pdb and b/DeploymentSource/Bin/PX.SmartSheetIntegration.pdb differ
diff --git a/PX.SmartSheetIntegration/PM/SetupMaintExt.cs b/PX.SmartSheetIntegration/PM/SetupMaintExt.cs
index d877adc..5ac1ea8 100644
--- a/PX.SmartSheetIntegration/PM/SetupMaintExt.cs
+++ b/PX.SmartSheetIntegration/PM/SetupMaintExt.cs
@@ -20,8 +20,8 @@ protected virtual void PMSetup_RowPersisting(PXCache sender, PXRowPersistingEven
             if (pmSetupSSExtRow.UsrSmartsheetClientID != null
                     && String.IsNullOrEmpty(pmSetupSSExtRow.UsrDefaultRateTableID))
             {
-                sender.RaiseExceptionHandling<PMSetupSSExt.usrDefaultRateTableID>(pmSetupRow, null, new PXSetPropertyException(ErrorMessages.FieldIsEmpty, PXErrorLevel.Error));
-                e.Cancel = true;
+                throw new PXRowPersistingException(typeof(PMSetupSSExt.usrDefaultRateTableID).Name, null,
+                                                          ErrorMessages.FieldIsEmpty);
             }
         }
         #endregion
diff --git a/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs b/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs
index b1fb4c0..6f5901c 100644
--- a/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs
+++ b/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs
@@ -29,7 +29,7 @@ protected virtual void RequestSSToken()
         {
             PMSetup pmSetupRow = PXSelect<PMSetup>.Select(Base);
             PMSetupSSExt pmSetupSSExtRow = PXCache<PMSetup>.GetExtension<PMSetupSSExt>(pmSetupRow);
-            string loginScopeCompany = PXDatabase.Companies.Length > 0 ? Base.Accessinfo.CompanyName : String.Empty;
+            string loginScopeCompany = PXDatabase.Companies.Length > 0 ? PXAccess.GetCompanyName() : String.Empty;
             string currentScope = String.Format(",{0},{1}", Base.Accessinfo.UserName, loginScopeCompany);
             if (pmSetupSSExtRow != null && pmSetupSSExtRow.UsrSmartsheetClientID != null)
             {