added more error handling
Merge branch 'master' of github.com:evalgo/evhandler