Add more error log.
Fix the conflict.