Merge "Only log on error"