Added new exception, updated methods