Out of curiosity - isn't this something that the handlers themselves should take care of?