diff --git a/sources/youtubeVideo.go b/sources/youtubeVideo.go
index 4047320..925dfc3 100644
--- a/sources/youtubeVideo.go
+++ b/sources/youtubeVideo.go
@@ -155,6 +155,8 @@ func (v *YoutubeVideo) download() error {
 		err = videoInfo.Download(formats[formatIndex], downloadedFile)
 		downloadedFile.Close()
 		if err != nil {
+			//delete the video and ignore the error
+			_ = v.delete()
 			break
 		}
 		fi, err := os.Stat(v.getFilename())
@@ -172,7 +174,6 @@ func (v *YoutubeVideo) download() error {
 			break
 		}
 	}
-
 	return err
 }
 
@@ -275,11 +276,8 @@ func (v *YoutubeVideo) Sync(daemon *jsonrpc.Client, claimAddress string, amount
 	summary, err := v.publish(daemon, claimAddress, amount, channelID, namer)
 	//delete the video in all cases (and ignore the error)
 	_ = v.delete()
-	if err != nil {
-		return nil, errors.Prefix("publish error", err)
-	}
 
-	return summary, nil
+	return summary, errors.Prefix("publish error", err)
 }
 
 // sorting videos
diff --git a/ytsync.go b/ytsync.go
index b3df5fc..784b06b 100644
--- a/ytsync.go
+++ b/ytsync.go
@@ -260,7 +260,7 @@ func (s *Sync) FullCycle() (e error) {
 
 	err = s.downloadWallet()
 	if err != nil && err.Error() != "wallet not on S3" {
-		return errors.Prefix("failure in downloading wallet: ", err)
+		return errors.Prefix("failure in downloading wallet", err)
 	} else if err == nil {
 		log.Println("Continuing previous upload")
 	} else {
@@ -313,9 +313,8 @@ func (s *Sync) setChannelTerminationStatus(e *error) {
 		failureReason := (*e).Error()
 		_, _, err := s.Manager.apiConfig.SetChannelStatus(s.YoutubeChannelID, StatusFailed, failureReason)
 		if err != nil {
-			msg := fmt.Sprintf("Failed setting failed state for channel %s.", s.LbryChannelName)
-			err = errors.Prefix(msg, err)
-			*e = errors.Prefix(err.Error(), *e)
+			msg := fmt.Sprintf("Failed setting failed state for channel %s", s.LbryChannelName)
+			*e = errors.Prefix(msg+err.Error(), *e)
 		}
 	} else if !s.IsInterrupted() {
 		_, _, err := s.Manager.apiConfig.SetChannelStatus(s.YoutubeChannelID, StatusSynced, "")
@@ -359,7 +358,7 @@ func (s *Sync) stopAndUploadWallet(e *error) {
 					e = &err //not 100% sure
 					return
 				} else {
-					*e = errors.Prefix("failure uploading wallet: ", *e)
+					*e = errors.Prefix("failure uploading wallet", *e)
 				}
 			}
 		}
@@ -438,11 +437,11 @@ func (s *Sync) doSync() error {
 	var err error
 	claims, err := s.daemon.ClaimListMine()
 	if err != nil {
-		return errors.Prefix("cannot list claims: ", err)
+		return errors.Prefix("cannot list claims", err)
 	}
 	hasDupes, err := s.fixDupes(*claims)
 	if err != nil {
-		return errors.Prefix("error checking for duplicates: ", err)
+		return errors.Prefix("error checking for duplicates", err)
 	}
 	if hasDupes {
 		SendInfoToSlack("Channel had dupes and was fixed!")
@@ -452,13 +451,13 @@ func (s *Sync) doSync() error {
 		}
 		claims, err = s.daemon.ClaimListMine()
 		if err != nil {
-			return errors.Prefix("cannot list claims: ", err)
+			return errors.Prefix("cannot list claims", err)
 		}
 	}
 
 	pubsOnWallet, nFixed, err := s.updateRemoteDB(*claims)
 	if err != nil {
-		return errors.Prefix("error counting claims: ", err)
+		return errors.Prefix("error counting claims", err)
 	}
 	if nFixed > 0 {
 		err := s.setStatusSyncing()
@@ -466,7 +465,6 @@ func (s *Sync) doSync() error {
 			return err
 		}
 		SendInfoToSlack("%d claims were not on the remote database and were fixed", nFixed)
-
 	}
 	pubsOnDB := 0
 	for _, sv := range s.syncedVideos {