Make GitHub Import more resilient