Bug fix to ensure routing through friends, no longer causes exception