add a rescue & increase the timeout time