diff --git a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
index 582f6bb081b4503e4707d6476aa12a02fcc8439b..8f77718064592e5a9416ce84385fa349f3f6109b 100644
--- a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
+++ b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
@@ -453,8 +453,7 @@ public class TorService extends Service {
      * Broadcasts the current status to any apps following the status of TorService.
      */
     static void sendBroadcastStatusIntent(Context context) {
-        Intent intent = getBroadcastIntent(ACTION_STATUS, currentStatus);
-        intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
+        Intent intent = getBroadcastIntent(context, ACTION_STATUS, currentStatus);
         context.sendBroadcast(intent);
     }
 
@@ -464,8 +463,7 @@ public class TorService extends Service {
      */
     static void broadcastStatus(Context context, String currentStatus) {
         TorService.currentStatus = currentStatus;
-        Intent intent = getBroadcastIntent(ACTION_STATUS, currentStatus);
-        intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
+        Intent intent = getBroadcastIntent(context, ACTION_STATUS, currentStatus);
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
         context.sendBroadcast(intent);
     }
@@ -479,12 +477,14 @@ public class TorService extends Service {
         if (e != null) {
             intent.putExtra(Intent.EXTRA_TEXT, e.getLocalizedMessage());
         }
+        intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
         context.sendBroadcast(intent);
     }
 
-    private static Intent getBroadcastIntent(String action, String currentStatus) {
+    private static Intent getBroadcastIntent(Context context, String action, String currentStatus) {
         Intent intent = new Intent(action);
+        intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
         intent.putExtra(EXTRA_STATUS, currentStatus);
         return intent;
     }