Added Exception

Fixed issue 2