Catch the right stuff
Add check for extremely rare cases of key collision