Tried to fix client crash sitch
Merge branch 'client_fix' of https://github.com/asrivat1/DS_Final