Added CR char to error and repeat messages