diff --git a/src/lammps.cpp b/src/lammps.cpp
index 7b41970666..7e351ea73b 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -542,11 +542,11 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
 
 LAMMPS::~LAMMPS()
 {
-  destroy();
+  const int me = comm->me;
 
+  destroy();
   delete citeme;
 
-  int me = comm->me;
   double totalclock = MPI_Wtime() - initclock;
   if ((me == 0) && (screen || logfile)) {
     char outtime[128];
@@ -675,13 +675,12 @@ void LAMMPS::post_create(int npack, int *pfirst, int *plast, char **arg)
     suffix2 = NULL;
   }
 
-  if (suffix) {
-    if (strcmp(suffix,"gpu") == 0) input->one("package gpu 1");
-    if (strcmp(suffix,"intel") == 0) input->one("package intel 1");
-    if (strcmp(suffix,"omp") == 0) input->one("package omp 0");
-  }
+  if (strcmp(suffix,"gpu") == 0) input->one("package gpu 1");
+  if (strcmp(suffix,"intel") == 0) input->one("package intel 1");
+  if (strcmp(suffix,"omp") == 0) input->one("package omp 0");
+
   if (suffix2) {
-    if (strcmp(suffix,"omp") == 0) input->one("package omp 0");
+    if (strcmp(suffix2,"omp") == 0) input->one("package omp 0");
   }
 
   // invoke any command-line package commands