Fix two more cases where contexts may not be completed
Merge pull request #781 from dleehr/fix-rest-contexts

Urgent fix for REST Webapp