diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
index 38a790f..a16b9c1 100644
--- a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
+++ b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
@@ -110,7 +110,12 @@
         while (iterator.hasNext()) {
             ServiceReference ref = (ServiceReference) iterator.next();
             ServiceRegistration reg = (ServiceRegistration) m_registrations.get(ref);
-            reg.unregister();
+            try {
+                reg.unregister();
+            } catch (IllegalStateException e) {
+                // The service is already unregistered
+                // Do nothing silently
+            }
         }
         m_registrations.clear();
     }
diff --git a/ipojo/composite/src/main/resources/metadata.xml b/ipojo/composite/src/main/resources/metadata.xml
index 263ef34..0f6262b 100644
--- a/ipojo/composite/src/main/resources/metadata.xml
+++ b/ipojo/composite/src/main/resources/metadata.xml
@@ -39,7 +39,7 @@
 		classname="org.apache.felix.ipojo.composite.architecture.ArchitectureHandler"
 		name="architecture" type="composite" architecture="false">
 		<provides>
-			<property field="m_name" name="architecture.instance" value="" />
+			<property field="m_name" name="architecture.instance"/>
 		</provides>
 	</handler>
 </ipojo>
\ No newline at end of file