API exceptions modified