Ensure handler does not get stuck and properly clean up mailbox