Don't duplicate handle close code