2 files changed, 12 insertions, 2 deletions
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Main.java b/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Main.java
index a94f9254ad..35ad6084ed 100644
--- a/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Main.java
+++ b/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Main.java
@@ -3,10 +3,12 @@ package org.xbmc.xbmc;
 import android.app.NativeActivity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 
 public class Main extends NativeActivity 
 {
   native void _onNewIntent(Intent intent);
+
   public Main() 
   {
     super();
@@ -22,7 +24,11 @@ public class Main extends NativeActivity
   protected void onNewIntent(Intent intent)
   {
     super.onNewIntent(intent);
-    _onNewIntent(intent);
+    try {
+      _onNewIntent(intent);
+    } catch (UnsatisfiedLinkError e) {
+      Log.e("Main", "Native not registered");
+    }
   }
 
 }
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/xbmc/XBMCBroadcastReceiver.java b/tools/android/packaging/xbmc/src/org/xbmc/xbmc/XBMCBroadcastReceiver.java
index a3c7886de4..93e37a43de 100644
--- a/tools/android/packaging/xbmc/src/org/xbmc/xbmc/XBMCBroadcastReceiver.java
+++ b/tools/android/packaging/xbmc/src/org/xbmc/xbmc/XBMCBroadcastReceiver.java
@@ -13,6 +13,10 @@ public class XBMCBroadcastReceiver extends BroadcastReceiver
   public void onReceive(Context context, Intent intent)
   {
     Log.d("XBMCBroadcastReceiver", "Received Intent");
-    _onReceive(intent);
+    try {
+      _onReceive(intent);
+    } catch (UnsatisfiedLinkError e) {
+      Log.e("XBMCBroadcastReceiver", "Native not registered");
+    }
   }
 }