Minor corrections
Add handling business exceptions