Corrected the code in "resolve_token_collisions" that checks for error
type. It was previously using "continue", for whatever reason, and would
therefore crash if a field other than the token field was throwing the
duplicate index key error. Now it correctly checks to see if the token
field is responsible for the duplicate key error, and if it's not, it
just re-raises the error, as it should.