diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java
index 67a745a6e9ff6d3d7cb0ff739931e72fe8e98df2..687efc6db36eebfd15154e8871691cb8d7c52036 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java
@@ -39,7 +39,7 @@ import org.fortiss.tooling.base.model.element.IModelElement;
  * @author barner
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 6CDDBEDED2A34C65AF1C5FD5315651A9
+ * @ConQAT.Rating YELLOW Hash: 66AEDAE9850DC4A70B474DD380C21D9F
  */
 public class EStructuralFeatureDescriptor {
 	/**
@@ -149,6 +149,9 @@ public class EStructuralFeatureDescriptor {
 	 * @param specification
 	 *            Specification for which the set of available objects is computed.
 	 * 
+	 * @return {@code true} iff an object is available to be selected for an {@link EReference}
+	 *         structural feature of an annotation.
+	 * 
 	 */
 	public boolean isAvailableObject(EObject obj, IAnnotatedSpecification specification,
 			EObject modelElement) {
@@ -160,13 +163,11 @@ public class EStructuralFeatureDescriptor {
 	 * {@link EStructuralFeatureDescriptor}.
 	 */
 	public EClassifier getEType(IAnnotatedSpecification specification) {
-		EClassifier eType = null;
 		try {
-			eType = getEStructuralFeature(specification).getEType();
+			return getEStructuralFeature(specification).getEType();
 		} catch(Exception e) {
-			// Ignore
+			return null;
 		}
-		return eType;
 	}
 
 	/**