diff --git a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
index 11a4248..f5ad934 100644
--- a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
+++ b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
@@ -73,6 +73,11 @@
      */
     public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext)
     {
+        if (creationalContext == null)
+        {
+            return null;
+        }
+
         if (component instanceof PassivationCapable && !(component instanceof Bean))
         {
             component = (Contextual<T>) BeanManagerProvider.getInstance().getBeanManager()