Fixing exception creation
Merge branch 'release/1.0.0alpha3'