Improve exceptions a bit
Merge pull request #23 from alvarolopez/exceptions

Improve exceptions a bit