Friends component fatal error fixes. See #1080