Fixes #15, improve exceptions messages