Added API exceptions
ficed merge