Changed circular dependency exception strategy (see #161)