Added error catching and API overload timer