Added exception handling
Merge branch 'master' of git://github.com/phork/microphork