diff --git a/src/cli/cli.go b/src/cli/cli.go
index 2ee1c76..5f7e2ee 100644
--- a/src/cli/cli.go
+++ b/src/cli/cli.go
@@ -131,8 +131,9 @@ func Run() {
 
 	err := app.Run(os.Args)
 	if err != nil {
-		fmt.Printf("\nerror: %s", err.Error())
+		fmt.Fprintf(os.Stderr, "\nerror: %s", err.Error())
 	}
+	fmt.Fprintf(os.Stderr, "\r\n")
 }
 
 func saveDefaultConfig(c *cli.Context) error {
diff --git a/src/croc/recipient.go b/src/croc/recipient.go
index 5efeff7..4326c34 100644
--- a/src/croc/recipient.go
+++ b/src/croc/recipient.go
@@ -609,7 +609,7 @@ func (cr *Croc) receive(forceSend int, serverAddress string, tcpPorts []string,
 					if useStdout {
 						cr.FileInfo.Name = "stdout"
 					}
-					fmt.Fprintf(os.Stderr, "\nReceived %s written to %s (%2.1f %s)\n", folderOrFile, cr.FileInfo.Name, transferRate, transferType)
+					fmt.Fprintf(os.Stderr, "\nReceived %s written to %s (%2.1f %s)", folderOrFile, cr.FileInfo.Name, transferRate, transferType)
 					os.Remove(progressFile)
 					cr.StateString = fmt.Sprintf("Received %s written to %s (%2.1f %s)", folderOrFile, cr.FileInfo.Name, transferRate, transferType)
 				}