Unhandled exceptions handling added
Merge pull request #46 from mauroa/master

Unhandled exceptions handling added