Related to #357 (closed)
I guess this is the first of many exception handling improvements.
I open this issue here since the source issue belongs to another project.
@mcastril @dbeltran