Moved call to super.close() out of conditional
Fixed ridiculous checkstyle warning about a private class not being final.