diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java b/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java
index 4164ae95aca..b7d92a078ac 100644
--- a/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java
+++ b/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java
@@ -102,7 +102,9 @@ public void addBean(Bean<?> bean) {
 
     @Override
     public <T> WeldBeanConfigurator<T> addBean() {
-        return addBean(getReceiver().getClass());
+        // null is only going to occur if the invocation is outside of OM in which case it will fail in the
+        // subsequent method inside checkWithinObserverNotification()
+        return addBean(getReceiver() != null ? getReceiver().getClass() : null);
     }
 
     /**