ERP-135

Updated logging to have more info.