Update terminating conditions
Merge pull request #454 from Metaswitch/issue443

[No reviewer] Update terminating conditions