Tidy up how invalid ids are handled.
Merge pull request #440 from git-harry/sprint

Merged automatically by jenkins after successful gate test