Fixed Exception errors
Merge git://github.com/darshanthaker/WordBuddy