Friends Crash Fix
Minor Crash Fix