ERP-135

Updated logging to have more info.
This actually does not tag the log line.  Fix is in ERP-130 pull request.