ADDS error catching and error msg's to poll_and_do