Fixed possible segfault on contol behaviour change. This is a mid-term s...

...olution until we have collected all needs by the effect branch and are able to optimize this out.

I have done this solution, because it is the simplest way to fix this issue without finish our strategy discussion. 
So we have a clean solution and we can optimize this for speed later, if required.