diff --git a/conf/quality-config/pmd-ruleset.xml b/conf/quality-config/pmd-ruleset.xml
index 241ddd22ad7807c7bbbc47ab909f3e80e6710067..d2d671583fdfd409c76a7ae6d0f05fb6cfae8ceb 100644
--- a/conf/quality-config/pmd-ruleset.xml
+++ b/conf/quality-config/pmd-ruleset.xml
@@ -65,6 +65,14 @@
 		<exclude name="AvoidUsingVolatile" />
 	</rule>
 
+	<!-- UR means "undefined reference" which is already detected by the compiler. 
+		so we deactivate it. -->
+	<rule ref="rulesets/java/controversial.xml/DataflowAnomalyAnalysis">
+		<properties>
+			<property name="violationSuppressRegex" value="^Found 'UR'-anomaly.*" />
+		</properties>
+	</rule>
+
 	<rule ref="rulesets/java/coupling.xml">
 		<exclude name="LawOfDemeter" />
 	</rule>
diff --git a/src/main/java/teetime/framework/ExecutionInstantiation.java b/src/main/java/teetime/framework/ExecutionInstantiation.java
index a6813eb72e9c1b953ea7c1e4c8e6aa02e782f023..e6105adbc0861bbbe9113e758d7e9d2aa025e3fb 100644
--- a/src/main/java/teetime/framework/ExecutionInstantiation.java
+++ b/src/main/java/teetime/framework/ExecutionInstantiation.java
@@ -66,10 +66,7 @@ class ExecutionInstantiation {
 			final OutputPort outputPort, final InstantiationPipe pipe) {
 		Stage targetStage = pipe.getTargetPort().getOwningStage();
 
-		int targetColor = DEFAULT_COLOR;
-		if (colors.containsKey(targetStage)) {
-			targetColor = colors.get(targetStage);
-		}
+		int targetColor = colors.containsKey(targetStage) ? colors.get(targetStage) : DEFAULT_COLOR;
 
 		if (threadableStages.contains(targetStage) && targetColor != color) {
 			if (pipe.capacity() != 0) {