diff --git a/app/src/main/java/com/huawei/hms/awareness/codelab/awareness/barrier/BeaconBarrierActivity.java b/app/src/main/java/com/huawei/hms/awareness/codelab/awareness/barrier/BeaconBarrierActivity.java
index 8230c8ca1d5f8812bf94dc9d27035033b44ba8d7..f605cabf7bb2a6f4e6c2a65bf9dd72a26a634c0c 100644
--- a/app/src/main/java/com/huawei/hms/awareness/codelab/awareness/barrier/BeaconBarrierActivity.java
+++ b/app/src/main/java/com/huawei/hms/awareness/codelab/awareness/barrier/BeaconBarrierActivity.java
@@ -58,7 +58,7 @@ public class BeaconBarrierActivity extends AppCompatActivity implements View.OnC
         Intent intent = new Intent(barrierReceiverAction);
         // You can also create PendingIntent with getActivity() or getService().
         // This depends on what action you want Awareness Kit to trigger when the barrier status changes.
-        mPendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        mPendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
 
         // Register a broadcast receiver to receive the broadcast sent by Awareness Kit when the barrier status changes.
         mBarrierReceiver = new BeaconBarrierReceiver();
@@ -130,6 +130,10 @@ public class BeaconBarrierActivity extends AppCompatActivity implements View.OnC
             BarrierStatus barrierStatus = BarrierStatus.extract(intent);
             String label = barrierStatus.getBarrierLabel();
             int barrierPresentStatus = barrierStatus.getPresentStatus();
+            if (label == null) {
+                mLogView.printLog("label is null.");
+                return;
+            }
             switch (label) {
                 case DISCOVER_BARRIER_LABEL:
                     if (barrierPresentStatus == BarrierStatus.TRUE) {