diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 9af144f806515..d5332d5934ee7 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3410,7 +3410,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
                 // TODO Do we have to do it even if userId != UserHandle.USER_ALL?  Otherwise,
                 // this check is probably not needed, since DO should be registered as a device
                 // admin on some user too. (Original bug for this: b/17657954)
-                if (packageName.equals(deviceOwnerPackageName)) {
+                if (packageName != null && packageName.equals(deviceOwnerPackageName)) {
                     return true;
                 }
                 // Does it contain a device admin for any user?