[Bug 420374] Call super.close() in a finally block

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
Merge "[Bug 420374] Call super.close() in a finally block"