diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
index 0f5b6c6..c61e2ae 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
@@ -215,7 +215,7 @@
 
 			@Override
 			public Expression getNextStateValueOf(ResourceIdentifier resId) {
-				if (nextSystemState.getResource(resId).getState() == null) return null;
+				if (nextSystemState.getResource(resId) == null) return null;
 				return nextSystemState.getResource(resId).getState().getValue();
 			}
 		};
@@ -253,7 +253,7 @@
 							nextEvents.add(nextEvent);
 						}
 					}
-					if (nextEvents.size() == 0) {
+					if (invDependency.size() == 0) {
 						Event nextEvent = new Event(channel, inResPath, nextSystemState.getResource(inResId));
 						nextEvent.setMessage(nextEvent.updateDependingParameters(resourceStateValueProvider));
 						nextEvents.add(nextEvent);