Add error message pattern
Improved fallback code for getting recipient address