1 files changed, 6 insertions, 3 deletions

diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java
index 06ceb9c35f..47ea6c0ca4 100644
--- a/android/src/org/rockbox/RockboxActivity.java
+++ b/android/src/org/rockbox/RockboxActivity.java
@@ -131,21 +131,24 @@ public class RockboxActivity extends Activity
     protected void onPause() 
     {
         super.onPause();
-        rbservice.set_activity(null);
+        if (rbservice != null)
+                rbservice.set_activity(null);
     }
     
     @Override
     protected void onStop() 
     {
         super.onStop();
-        rbservice.set_activity(null);
+        if (rbservice != null)
+                rbservice.set_activity(null);
     }
     
     @Override
     protected void onDestroy() 
     {
         super.onDestroy();
-        rbservice.set_activity(null);
+        if (rbservice != null)
+                rbservice.set_activity(null);
     }
 
     private void LOG(CharSequence text)