Add some better exception handling in the api