diff --git a/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java b/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java
index 892d732c8ee..11f1f9edf86 100644
--- a/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java
+++ b/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java
@@ -2,7 +2,7 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.persistence.EntityManager;
+import javax.webbeans.DefinitionException;
 import javax.webbeans.InjectionPoint;
 
 import org.jboss.webbeans.resources.spi.Naming;
@@ -20,23 +20,60 @@ public interface EjbResolver
    public static final String PROPERTY_NAME = EjbResolver.class.getName();
    
    /**
-    * Resolve the value for the given @EJB injection point
+    * Resolve the value for the given
     * 
-    * @param injectionPoint The injection point metadata
+    * @EJB injection point
+    * 
+    * @param injectionPoint
+    *           The injection point metadata
     * @return the JNDI name
+    * @throws IllegalArgumentException
+    *            if the injection point is not annotated with
+    * @EJB
+    * @throws DefinitionException
+    *            if the injection point is not suitable for injection
+    * @throws IllegalStateException
+    *            if no EJBs can be resolved for injection
     */
    public Object resolveEjb(InjectionPoint injectionPoint, Naming naming);
    
    /**
-    * Resolve the value for the given @PersistenceContext injection point
+    * Resolve the value for the given
+    * 
+    * @PersistenceContext injection point
     * 
-    * @param injectionPoint The injection point metadata
+    * @param injectionPoint
+    *           The injection point metadata
     * @return the JNDI name
+    * @throws IllegalArgumentException
+    *            if the injection point is not annotated with
+    * @PersistenceContext
+    * @throws UnsupportedOperationException
+    *            if the injection point is annotated
+    * @PersistenceContext(EXTENTED)
+    * @throws IllegalStateException
+    *            if no suitable persistence units can be resolved for injection
     */
    public Object resolvePersistenceUnit(InjectionPoint injectionPoint, Naming naming);
    
+   /**
+    * Get the annotation which defines an
+    * 
+    * @EJB injection point
+    * 
+    * @return the annotation which defines an
+    * @EJB injection point
+    */
    public Class<? extends Annotation> getEJBAnnotation();
    
+   /**
+    * Get the annoation which defines a
+    * 
+    * @PersistenceContext injection point
+    * 
+    * @return the annoation which defines a
+    * @PersistenceContext injection point
+    */
    public Class<? extends Annotation> getPersistenceContextAnnotation();
    
 }