diff --git a/android/src/main/java/com/ioreactnativecieid/IoReactNativeCieidModule.kt b/android/src/main/java/com/ioreactnativecieid/IoReactNativeCieidModule.kt
index 6ac9f6b..f6a83fe 100644
--- a/android/src/main/java/com/ioreactnativecieid/IoReactNativeCieidModule.kt
+++ b/android/src/main/java/com/ioreactnativecieid/IoReactNativeCieidModule.kt
@@ -51,10 +51,10 @@ class IoReactNativeCieidModule(reactContext: ReactApplicationContext) :
   // Extension function to handle API compatibility for getting signatures
   private fun PackageInfo.getSignaturesCompat(): Array<Signature> {
     return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
-      signingInfo.apkContentsSigners
+      signingInfo?.apkContentsSigners ?: emptyArray()
     } else {
       @Suppress("DEPRECATION")
-      signatures
+      signatures ?: emptyArray()
     }
   }
 
@@ -85,7 +85,7 @@ class IoReactNativeCieidModule(reactContext: ReactApplicationContext) :
     url: String,
     resultCallback: Callback
   ) {
-    currentActivity?.let { activity ->
+    getReactApplicationContext().getCurrentActivity()?.let { activity ->
       val intent = Intent().apply {
         setClassName(packageName, className)
         data = Uri.parse(url)
@@ -118,7 +118,7 @@ class IoReactNativeCieidModule(reactContext: ReactApplicationContext) :
   }
 
   override fun onActivityResult(
-    activity: Activity?,
+    activity: Activity,
     requestCode: Int,
     resultCode: Int,
     data: Intent?
@@ -155,7 +155,7 @@ class IoReactNativeCieidModule(reactContext: ReactApplicationContext) :
     onActivityResultCallback = null
   }
 
-  override fun onNewIntent(intent: Intent?) {
+  override fun onNewIntent(intent: Intent) {
     // We do not expect add any data handling here,
     // but we add a log in case we need to debug some edge cases.
     Log.d(name, "onNewIntent has been called")