Fix entity already tracked IllegalStateException, fixes #96

Signed-off-by: Ross Allan <rallanpcl@gmail.com>