diff --git a/avarice/src/jtag2usb.cc b/avarice/src/jtag2usb.cc
index 10acd25f0bc2998baf4f3c0e2d23e635cba1baa6..4079f1f6ba0a61a9c9a5daf92b69483183d3e892 100644
--- a/avarice/src/jtag2usb.cc
+++ b/avarice/src/jtag2usb.cc
@@ -641,12 +641,12 @@ static hid_device *openhid(const char *jtagDeviceName, unsigned int &max_pkt_siz
     return NULL;
 
   walk = list;
-
   while (walk)
     {
       if (walk->product_string == NULL)
 	{
 	  fprintf(stderr, "Unknown error: Could not read product string from Atmel device.\n");
+	  walk = walk->next;
 	  continue;
 	}