Remove the unnecessary throws. Use return values
Merge branch 'master' of https://github.com/darshankapashi/zeon