diff --git a/src/create_box.cpp b/src/create_box.cpp
index e42c7c32f0..c534bf63f8 100644
--- a/src/create_box.cpp
+++ b/src/create_box.cpp
@@ -117,7 +117,7 @@ void CreateBox::command(int narg, char **arg)
 
     // use lattice2box() to generate origin and ABC vectors
     // origin = abc lo
-    // ABC vectors = hi in one dim - orign
+    // ABC vectors = hi in one dim - origin
     
     double avec[3],bvec[3],cvec[3],origin[3];
     double px,py,pz;
diff --git a/src/lattice.cpp b/src/lattice.cpp
index a5dc9714cf..6d7450fd2b 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -239,11 +239,11 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
     if (origin[2] != 0.0)
       error->all(FLERR,
                  "Lattice settings are not compatible with 2d simulation");
-    if (orientx[2] != 0 || orienty[2] != 0 ||
-        orientz[0] != 0 || orientz[1] != 0)
+    if (a1[2] != 0.0 || a2[2] != 0.0 || a3[0] != 0.0 || a3[1] != 0.0)
       error->all(FLERR,
                  "Lattice settings are not compatible with 2d simulation");
-    if (a1[2] != 0.0 || a2[2] != 0.0 || a3[0] != 0.0 || a3[1] != 0.0)
+    if (orientx[2] != 0 || orienty[2] != 0 ||
+        orientz[0] != 0 || orientz[1] != 0)
       error->all(FLERR,
                  "Lattice settings are not compatible with 2d simulation");
   }