Added APIHandler to exceptions