Handled more exceptions
Merge branch 'master' of https://github.com/withoutuniverse/AndroidEmoticons.git