Fixed the exception problem caused by the evil shark
Merge pull request #125 from itpun/master

Fixed the exception problem caused by the evil shark