add more error logging, remove error retry logic