Only fail if retcode is non-zero
Merge pull request #16489 from basepi/scp16437

Only fail if retcode is non-zero