Fix corner cases which would have allowed duplicate entries to be attempted in EmcRegistry