Fix bug lurking in HandlerContext