Better handling of exceptions, #111
Merge pull request #150 from josemduarte/master

Another little improvement on exception handling, #111
Most recent changes
Merge origin/master