diff --git a/src/plugins/select/bluegene/bluegene.c b/src/plugins/select/bluegene/bluegene.c
index 0326211223f58e60b43cca4f6bfb439cb8ed5768..dfb84a2365b2b46896c3ca90a94d9d9c7dd41bbd 100644
--- a/src/plugins/select/bluegene/bluegene.c
+++ b/src/plugins/select/bluegene/bluegene.c
@@ -291,9 +291,11 @@ extern bgl_record_t *find_bgl_record(char *bgl_part_id)
 	
 	if(bgl_list) {
 		itr = list_iterator_create(bgl_list);
-		while ((bgl_record = (bgl_record_t *) list_next(itr)) != NULL) 
-			if (!strcmp(bgl_record->bgl_part_id, bgl_part_id))
-				break;
+		while ((bgl_record = (bgl_record_t *) list_next(itr)) != NULL)
+			if(bgl_record->bgl_part_id)
+				if (!strcmp(bgl_record->bgl_part_id, 
+					    bgl_part_id))
+					break;
 		
 		list_iterator_destroy(itr);
 		if(bgl_record)