Added fallback logic if no response from server, decreased wait time between polling requests'