Added more logs to track better errors