Merge "Add new exception class"