diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index f90d471d35..4b0592ade0 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -192,6 +192,16 @@
       android:launchMode="singleTask"
       android:theme="@style/AppTheme.Base" />
 
+    <provider
+      android:name="androidx.core.content.FileProvider"
+      android:authorities="${applicationId}.fileProvider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/file_paths" />
+    </provider>
+
   </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/android/KMEA/app/src/main/res/xml/file_paths.xml b/android/KMAPro/kMAPro/src/main/res/xml/file_paths.xml
similarity index 100%
rename from android/KMEA/app/src/main/res/xml/file_paths.xml
rename to android/KMAPro/kMAPro/src/main/res/xml/file_paths.xml
diff --git a/android/KMEA/app/src/main/AndroidManifest.xml b/android/KMEA/app/src/main/AndroidManifest.xml
index 4b2f8eb62c..cbc8d9644a 100644
--- a/android/KMEA/app/src/main/AndroidManifest.xml
+++ b/android/KMEA/app/src/main/AndroidManifest.xml
@@ -68,17 +68,6 @@
             android:label="@string/app_name"
             android:theme="@style/Theme.AppCompat.Light.Dialog" >
         </activity>
-
-        <provider
-          android:name="androidx.core.content.FileProvider"
-          android:authorities="com.tavultesoft.kmea.fileProvider"
-          android:exported="false"
-          android:grantUriPermissions="true">
-          <meta-data
-            android:name="android.support.FILE_PROVIDER_PATHS"
-            android:resource="@xml/file_paths" />
-        </provider>
-
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java
index d04714be42..e8dcb6bc6d 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java
@@ -24,6 +24,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.tavultesoft.kmea.util.FileUtils;
 
@@ -100,10 +101,12 @@ public final class KeyboardInfoActivity extends AppCompatActivity {
               // Starting with Android N, you can't pass file:// to intents, so we use FileProvider
               try {
                 Uri contentUri = FileProvider.getUriForFile(
-                  context, "com.tavultesoft.kmea.fileProvider", customHelp);
+                  context, getApplication().getPackageName() + ".fileProvider", customHelp);
                 i.setDataAndType(contentUri, "text/html");
-              } catch (Exception e) {
-                Log.e("KeyboardInfoActivity", "Failed to access " + customHelp.toString());
+              } catch (NullPointerException e) {
+                String message = "FileProvider undefined in app to load" + customHelp.toString();
+                Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+                Log.e("KeyboardInfoActivity", message);
               }
             }
             else {
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardSettingsActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardSettingsActivity.java
index db82379430..ad4446f377 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardSettingsActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardSettingsActivity.java
@@ -25,6 +25,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.tavultesoft.kmea.util.FileUtils;
 import com.tavultesoft.kmea.util.MapCompat;
@@ -143,10 +144,12 @@ public final class KeyboardSettingsActivity extends AppCompatActivity {
               // Starting with Android N, you can't pass file:// to intents, so we use FileProvider
               try {
                 Uri contentUri = FileProvider.getUriForFile(
-                  context, "com.tavultesoft.kmea.fileProvider", customHelp);
+                  context, getApplication().getPackageName() + ".fileProvider", customHelp);
                 i.setDataAndType(contentUri, "text/html");
-              } catch (Exception e) {
-                Log.e("KeyboardInfoActivity", "Failed to access " + customHelp.toString());
+              } catch (NullPointerException e) {
+                String message = "FileProvider undefined in app to load" + customHelp.toString();
+                Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+                Log.e("KeyboardInfoActivity", message);
               }
             }
             else {
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java
index 93ba85519c..ea8fce4769 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java
@@ -143,10 +143,12 @@ public final class ModelInfoActivity extends AppCompatActivity {
               // Starting with Android N, you can't pass file:// to intents, so we use FileProvider
               try {
                 Uri contentUri = FileProvider.getUriForFile(
-                  context, "com.tavultesoft.kmea.fileProvider", customHelp);
+                  context, getApplication().getPackageName() + ".fileProvider", customHelp);
                 i.setDataAndType(contentUri, "text/html");
-              } catch (Exception e) {
-                Log.e("ModelInfoActivity", "Failed to access " + customHelp.toString());
+              } catch (NullPointerException e) {
+                String message = "FileProvider undefined in app to load" + customHelp.toString();
+                Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+                Log.e("ModelInfoActivity", message);
               }
             }
             else {