diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
index cc8e5024045523f67d5d4faa8fd86ebb1929b4fd..29c8e41f195e4e22430bbf54298601236007b333 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
@@ -43,7 +43,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 48071ECDD1BF677507C8039C956F8C62
+ * @ConQAT.Rating YELLOW Hash: 2D2D4877EAFC4F0C40E1C6A744EBACC1
  */
 public class ModelElementHandlerService extends
 		EObjectAwareServiceBase<IModelElementHandler<EObject>> implements
@@ -116,10 +116,7 @@ public class ModelElementHandlerService extends
 	@Override
 	public String getName(EObject modelElement) {
 		IModelElementHandler<EObject> handler = getModelElementHandler(modelElement);
-		if(handler != null) {
-			return handler.getName(modelElement);
-		}
-		return null;
+		return handler == null ? null : handler.getName(modelElement);
 	}
 
 	/** {@inheritDoc} */
@@ -136,10 +133,7 @@ public class ModelElementHandlerService extends
 	@Override
 	public Image getIcon(EObject modelElement) {
 		IModelElementHandler<EObject> handler = getModelElementHandler(modelElement);
-		if(handler != null) {
-			return handler.getIcon(modelElement);
-		}
-		return null;
+		return handler == null ? null : handler.getIcon(modelElement);
 	}
 
 	/** {@inheritDoc} */