Adding error handling for invalid CND updates

Fixes https://www.pivotaltracker.com/story/show/71684002