Added new exception.
Merged changes