Issue #111; got rid of EVENT_ADD_NEW; also, issue #112, put in code to check for this unusual condition