Merge pull request #253 from ljwolford/bugs

removed exceptions
fixed weird id uniqueness