Improve log/warning.