Merge "Remove possible leak when exception occurred."