Merge "Bug 37209: change exception into debug entry"