Issue #2156333 by mahfiaz: Fixed possible error message being replied to email when everything actually went fine.