diff --git a/controller/src/main/java/org/jboss/as/controller/ServiceNameFactory.java b/controller/src/main/java/org/jboss/as/controller/ServiceNameFactory.java
index 25e243593c0..b3d43dcb757 100644
--- a/controller/src/main/java/org/jboss/as/controller/ServiceNameFactory.java
+++ b/controller/src/main/java/org/jboss/as/controller/ServiceNameFactory.java
@@ -153,7 +153,10 @@ public static ServiceName resolveServiceName(QuaternaryServiceDescriptor<?> desc
     }
 
     private static ServiceName parseServiceName(Map.Entry<String, String[]> resolved) {
-        return parseServiceName(resolved.getKey()).append(resolved.getValue());
+        ServiceName result = parseServiceName(resolved.getKey());
+        String[] values = resolved.getValue();
+        // ServiceName.append(...) throws an ISE if called with empty array
+        return (values.length > 0) ? result.append(values) : result;
     }
 
     static void clearCache() {