Move log message to where it makes sense.