DEVELOPER-770 protect against id not existing
Merge pull request #346 from pmuir/DEVELOPER-770

Developer 770