Prevent leaked handlers.
Merge pull request #3 from sajacy/master

Prevent leaked handlers.