--- upstream/dynamips-0.2.6-RC4/cpu.c	2007/10/06 16:08:03	5
+++ upstream/dynamips-0.2.6-RC5/cpu.c	2007/10/06 16:09:07	6
@@ -31,6 +31,9 @@
 {
    cpu_mips_t *cpu;
 
+   if (!group)
+      return NULL;
+
    for(cpu=group->cpu_list;cpu;cpu=cpu->next)
       if (cpu->id == id)
          return cpu;
@@ -58,6 +61,9 @@
 /* Add a CPU in a CPU group */
 int cpu_group_add(cpu_group_t *group,cpu_mips_t *cpu)
 {
+   if (!group)
+      return(-1);
+
    /* check that we don't already have a CPU with this id */
    if (cpu_group_find_id(group,cpu->id) != NULL) {
       fprintf(stderr,"cpu_group_add: CPU%u already present in group.\n",