Merge "Gracefully failing Exceptions during logging" into udc-dev