diff --git a/build-tools/xml-repository/src/main/java/com/tyron/xml/completion/repository/api/ResourceNamespace.java b/build-tools/xml-repository/src/main/java/com/tyron/xml/completion/repository/api/ResourceNamespace.java
index 7b2080317..d1bcba9a3 100644
--- a/build-tools/xml-repository/src/main/java/com/tyron/xml/completion/repository/api/ResourceNamespace.java
+++ b/build-tools/xml-repository/src/main/java/com/tyron/xml/completion/repository/api/ResourceNamespace.java
@@ -145,8 +145,7 @@ public String prefixToUri(@NotNull String namespacePrefix) {
     @NotNull
     public static ResourceNamespace fromPackageName(@NotNull String packageName) {
         assert !Strings.isNullOrEmpty(packageName);
-        if (packageName.equals(SdkConstants.ANDROID_NS_NAME)) {
-            // Make sure ANDROID is a singleton, so we can use object identity to check for it.
+        if (packageName != null && packageName.equals(SdkConstants.ANDROID_NS_NAME)) {
             return ANDROID;
         } else {
             return new ResourceNamespace(SdkConstants.URI_PREFIX + packageName, packageName);