Revered the whole exit, end and close event issue
Incremented the module's patch version