Fixed a bug whereby a catastrophic infrasturcture error brought down the polling thread