diff --git a/scp.c b/scp.c
index f0e9e799..fb48f579 100644
--- a/scp.c
+++ b/scp.c
@@ -1502,7 +1502,7 @@ t_stat shift_args (char *do_arg[], size_t arg_count)
 {
 size_t i;
 
-for (i=1; i<arg_count; ++i)
+for (i=1; i<arg_count-1; ++i)
     do_arg[i] = do_arg[i+1];
 return SCPE_OK;
 }
diff --git a/sim_ether.c b/sim_ether.c
index f272dcf4..146ab841 100644
--- a/sim_ether.c
+++ b/sim_ether.c
@@ -569,7 +569,8 @@ char* eth_getname(int number, char* name)
   ETH_LIST  list[ETH_MAX_DEVICE];
   int count = eth_devices(ETH_MAX_DEVICE, list);
 
-  if (count <= number) return NULL;
+  if ((number < 0) || (count <= number))
+      return NULL;
   strcpy(name, list[number].name);
   return name;
 }