Merge "fix error log statement"