Done, it all looks good now.
More cosmetic while trying to find a fix for #254
* Adding new exception type
* Fixing #253 by catching exception