Use correct sender address in error handler