diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor
index 6e6523f5..fb5938f4 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Export.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor
@@ -7,7 +7,7 @@
 
 <div class="container">
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
+        <Label Class="col-sm-3" For="content" HelpText="The Exported Module Content" ResourceKey="Content">Content: </Label>
         <div class="col-sm-9">
             <textarea id="content" class="form-control" @bind="@_content" rows="5" readonly></textarea>
         </div>
@@ -25,6 +25,15 @@
 
     private async Task ExportModule()
     {
-        _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId);
+        try
+        {
+            _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId);
+            AddModuleMessage(Localizer["Success.Content.Export"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Exporting Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
+            AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
+        }
     }
 }
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx
index ee8f36d1..2e6a713f 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx
@@ -121,9 +121,15 @@
     <value>Export</value>
   </data>
   <data name="Content.HelpText" xml:space="preserve">
-    <value>Enter the module content</value>
+    <value>The Exported Module Content</value>
   </data>
   <data name="Content.Text" xml:space="preserve">
     <value>Content: </value>
   </data>
+  <data name="Error.Module.Export" xml:space="preserve">
+    <value>Error Exporting Module Content</value>
+  </data>
+  <data name="Success.Content.Export" xml:space="preserve">
+    <value>Content Exported Successfully</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx
index d008f096..acbfc2ab 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Content.HelpText" xml:space="preserve">
-    <value>Enter the module content</value>
+    <value>Enter The Module Content To Import</value>
   </data>
   <data name="Content.Text" xml:space="preserve">
     <value>Content: </value>
@@ -133,7 +133,7 @@
     <value>A Problem Was Encountered Importing Content. Please Ensure The Content Is Formatted Correctly For The Module.</value>
   </data>
   <data name="Error.Module.Import" xml:space="preserve">
-    <value>Error Importing Module</value>
+    <value>Error Importing Module Content</value>
   </data>
   <data name="Message.Required.ImportContent" xml:space="preserve">
     <value>You Must Enter Some Content To Import</value>