diff --git a/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
index e7c739f..4595f9e 100644
--- a/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
@@ -230,8 +230,9 @@
                         + topTask.topActivity.getClassName());
                 return;
             }
-            if (!topTask.topActivity.equals(mDesiredComponent)) {
-                Log.d(TAG, "Unexpected component: " + topTask.topActivity.getClassName());
+            if (mDesiredComponent != null && !topTask.topActivity.equals(mDesiredComponent)) {
+                Log.d(TAG, String.format("Unexpected component: %s. Expected: %s",
+                        topTask.topActivity.getClassName(), mDesiredComponent));
                 return;
             }