Merge "fix log messages and bogus error message"