diff --git a/src/main/java/org/slf4j/cdi/LoggerProducer.java b/src/main/java/org/slf4j/cdi/LoggerProducer.java
index ac225e2..d1798a2 100644
--- a/src/main/java/org/slf4j/cdi/LoggerProducer.java
+++ b/src/main/java/org/slf4j/cdi/LoggerProducer.java
@@ -1,16 +1,55 @@
+/**
+ * Copyright (c) 2017 Patrick Reinhart
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free  of charge, to any person obtaining
+ * a  copy  of this  software  and  associated  documentation files  (the
+ * "Software"), to  deal in  the Software without  restriction, including
+ * without limitation  the rights to  use, copy, modify,  merge, publish,
+ * distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ * permit persons to whom the Software  is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The  above  copyright  notice  and  this permission  notice  shall  be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ * EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ * MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package org.slf4j.cdi;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * CDI Producer for {@link Logger} instances based on the target bean class.
+ * 
+ * @author Patrick Reinhart
+ */
 @ApplicationScoped
 public class LoggerProducer {
+
     @Produces
-    public static Logger createLogger(InjectionPoint ip) {
-        return LoggerFactory.getLogger(ip.getBean().getBeanClass());
+    public Logger createLogger(InjectionPoint ip) {
+      final Bean<?> bean = ip.getBean();
+      final Class<?> loggerClass;
+      if (bean == null) {
+        loggerClass = ip.getMember().getDeclaringClass();
+      } else {
+        loggerClass = bean.getBeanClass();
+      }
+      return LoggerFactory.getLogger(loggerClass);
     }
+
 }