Card #259 fix for undefined recipient