diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp
index 57dd6df1c38e892e1a7590ee7f16403c062c257c..c198d97e1429f1a9c5bffee5789e946edaaaa1f9 100644
--- a/src/KOKKOS/kokkos.cpp
+++ b/src/KOKKOS/kokkos.cpp
@@ -159,8 +159,8 @@ void KokkosLMP::accelerator(int narg, char **arg)
       else if (strcmp(arg[iarg+1],"n2") == 0) neighflag = N2;
       else if (strcmp(arg[iarg+1],"full/cluster") == 0) neighflag = FULLCLUSTER;
       else error->all(FLERR,"Illegal package kokkos command");
-      if (neighflag == HALF && num_threads > 1 || ngpu > 0)
-        error->all(FLERR,"Must use Kokkos half/thread or full neighbor list with threads or GPU");
+      if (neighflag == HALF && (num_threads > 1 || ngpu > 0))
+        error->all(FLERR,"Must use Kokkos half/thread or full neighbor list with threads or GPUs");
       iarg += 2;
     } else if (strcmp(arg[iarg],"binsize") == 0) {
       if (iarg+2 > narg) error->all(FLERR,"Illegal package kokkos command");
diff --git a/src/KOKKOS/kokkos.h b/src/KOKKOS/kokkos.h
index 4db638803efa58b46df952019f9054cb7475d61b..20d38da21ef36bc2677dfa727fc3026ed60e70b4 100644
--- a/src/KOKKOS/kokkos.h
+++ b/src/KOKKOS/kokkos.h
@@ -55,7 +55,7 @@ E: Kokkos has been compiled for CUDA but no GPUs are requested
 
 One or more GPUs must be used when Kokkos is compiled for CUDA.
 
-E: Must use Kokkos half/thread or full neighbor list with threads or GPU
+E: Must use Kokkos half/thread or full neighbor list with threads or GPUs
 
 Using Kokkos half neighbor list with threading is not allowed.