Fixed null pointer
Merge branch 'master' of github.com:sidharthm/CS485TFS