diff --git a/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java b/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
index c28fa73..6ebba7f 100644
--- a/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
+++ b/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
@@ -274,7 +274,9 @@
 
         AdapterFactory factory = (AdapterFactory) context.locateService(
             "AdapterFactory", reference);
-
+        if ( factory == null ) {
+            return;
+        }
         AdapterFactoryDescriptorKey factoryKey = new AdapterFactoryDescriptorKey(
             reference);
         AdapterFactoryDescriptor factoryDesc = new AdapterFactoryDescriptor(