Deal with connection errors properly
Poll for events more frequently