Merge "fix mem leak on error handling"