Fix for TFS Issue 1296219 (cloud service null reference)
Merge pull request #2320 from markcowl/cloudservicefix

Fix for TFS Issue 1296219 (cloud service null reference)