diff --git a/src/neighbor.cpp b/src/neighbor.cpp
index 1a38685fb077c97ce5566901b7aedcf4a7059f95..65243a8e0e1efbd8a368d44599f44dbfd8447dee 100644
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@@ -1217,12 +1217,14 @@ void Neighbor::build_one(int i)
     memory->create(bins,maxbin,"bins");
   }
 
-  // this condition can cause LAMMPS to crash
+  // when occasional list built, LAMMPS can crash if atoms have moved too far
+  // why is this?, give warning if this is the case
   // no easy workaround b/c all neighbor lists really need to be rebuilt
-  // solution is for input script to check more often for rebuild, so warn
+  // solution is for input script to check more often for rebuild
+  // only check_distance if running a simulation, not between simulations
 
   int flag = 0;
-  if (dist_check) flag = check_distance();
+  if (dist_check && update->whichflag) flag = check_distance();
   if (flag && me == 0)
     error->warning("Building an occasional neighobr list when "
 		   "atoms may have moved too far");
diff --git a/src/velocity.cpp b/src/velocity.cpp
index 7a8505faa722cad8a4280be72bcaedf15ea032a7..c590ece9dbd015636105b22f48c5b5a5ad74a055 100644
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@@ -432,7 +432,7 @@ void Velocity::set(int narg, char **arg)
     if (zstyle == CONSTANT && vz != 0.0)
       error->all("Cannot set non-zero z velocity for 2d simulation");
     if (zstyle == EQUAL || zstyle == ATOM)
-      error->all("Cannot set varaible z velocity for 2d simulation");
+      error->all("Cannot set variable z velocity for 2d simulation");
   }
 
   // allocate vfield array if necessary