Ref #3, fix error when no entity is currently active for control
Merge branch 'bugfix/3-error-during-transition' into develop