Make file descriptor handling more resilient