Plug a leak and beef-up test coverage.