master
 - exception raising refactored