diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java
index 32bd9f7cc9..d48ea901fd 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java
@@ -20,7 +20,7 @@ private static boolean isGooglePlayStoreInstalled() {
          PackageInfo info = pm.getPackageInfo(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, PackageManager.GET_META_DATA);
          String label = (String) info.applicationInfo.loadLabel(pm);
          return (!label.equals("Market"));
-      } catch (PackageManager.NameNotFoundException e) {
+      } catch (Exception e) {
          // Google Play Store might not be installed, ignore exception if so
       }
 
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java
index 300b47b72f..00b68d9d57 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java
@@ -260,7 +260,7 @@ static void getLocation(Context context, boolean promptLocation, boolean fallbac
                   sendAndClearPromptHandlers(promptLocation, result);
                   fireFailedComplete();
                }
-            } catch (PackageManager.NameNotFoundException e) {
+            } catch (Exception e) {
                sendAndClearPromptHandlers(promptLocation, OneSignal.PromptActionResult.ERROR);
                e.printStackTrace();
             }
@@ -295,7 +295,7 @@ private static void backgroundLocationPermissionLogic(Context context, boolean p
             sendAndClearPromptHandlers(promptLocation, OneSignal.PromptActionResult.PERMISSION_GRANTED);
             startGetLocation();
          }
-      } catch (PackageManager.NameNotFoundException e) {
+      } catch (Exception e) {
          sendAndClearPromptHandlers(promptLocation, OneSignal.PromptActionResult.ERROR);
          e.printStackTrace();
       }
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java
index 6f422d87e7..8e09c6e1e1 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java
@@ -42,16 +42,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationManagerCompat;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
-import androidx.legacy.content.WakefulBroadcastReceiver;
-
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.huawei.hms.api.HuaweiApiAvailability;
 
@@ -70,6 +63,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.legacy.content.WakefulBroadcastReceiver;
 import static com.onesignal.OneSignal.Log;
 
 class OSUtils {
@@ -275,7 +273,7 @@ private static boolean packageInstalledAndEnabled(@NonNull String packageName) {
          PackageManager pm = OneSignal.appContext.getPackageManager();
          PackageInfo info = pm.getPackageInfo(packageName, PackageManager.GET_META_DATA);
          return info.applicationInfo.enabled;
-      } catch (PackageManager.NameNotFoundException e) {
+      } catch (Exception e) {
          return false;
       }
    }
@@ -291,7 +289,12 @@ static boolean isGMSInstalledAndEnabled() {
    private static final int HMS_AVAILABLE_SUCCESSFUL = 0;
    private static boolean isHMSCoreInstalledAndEnabled() {
       HuaweiApiAvailability availability = HuaweiApiAvailability.getInstance();
-      return availability.isHuaweiMobileServicesAvailable(OneSignal.appContext) == HMS_AVAILABLE_SUCCESSFUL;
+      try {
+         return availability.isHuaweiMobileServicesAvailable(OneSignal.appContext) == HMS_AVAILABLE_SUCCESSFUL;
+      } catch (Exception e) {
+         e.printStackTrace();
+      }
+      return false;
    }
 
    private static final String HMS_CORE_SERVICES_PACKAGE = "com.huawei.hwid"; // = HuaweiApiAvailability.SERVICES_PACKAGE
@@ -411,7 +414,7 @@ static Bundle getManifestMetaBundle(Context context) {
       try {
          ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
          return ai.metaData;
-      } catch (PackageManager.NameNotFoundException e) {
+      } catch (Exception e) {
          Log(OneSignal.LOG_LEVEL.ERROR, "Manifest application info not found", e);
       }
 
@@ -492,7 +495,7 @@ static int getTargetSdkVersion(Context context) {
       try {
          ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);
          return applicationInfo.targetSdkVersion;
-      } catch (PackageManager.NameNotFoundException e) {
+      } catch (Exception e) {
          e.printStackTrace();
       }
 
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
index 285e028daf..29c16c7eb0 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
@@ -40,17 +40,12 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-import androidx.core.app.NotificationCompat;
-
+import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoCompletionHandler;
+import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoError;
 import com.onesignal.influence.data.OSTrackerFactory;
 import com.onesignal.influence.domain.OSInfluence;
 import com.onesignal.language.LanguageContext;
 import com.onesignal.language.LanguageProviderAppDefined;
-import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoError;
-import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoCompletionHandler;
 import com.onesignal.outcomes.data.OSOutcomeEventsFactory;
 
 import org.json.JSONArray;
@@ -72,6 +67,10 @@
 import java.util.Map;
 import java.util.TimeZone;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.core.app.NotificationCompat;
 import static com.onesignal.GenerateNotification.BUNDLE_KEY_ACTION_ID;
 import static com.onesignal.GenerateNotification.BUNDLE_KEY_ANDROID_NOTIFICATION_ID;
 import static com.onesignal.NotificationBundleProcessor.newJsonArray;
@@ -1519,7 +1518,7 @@ private static void registerUserTask() throws JSONException {
 
       try {
          deviceInfo.put("game_version", packageManager.getPackageInfo(packageName, 0).versionCode);
-      } catch (PackageManager.NameNotFoundException e) {}
+      } catch (Exception e) {}
 
       deviceInfo.put("net_type", osUtils.getNetType());
       deviceInfo.put("carrier", osUtils.getCarrierName());