diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index f5346dec74..843619a266 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -801,13 +801,14 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR})
 ######################################
 # Generate lmpinstalledpkgs.h
 ######################################
-set(temp "const char * LAMMPS_NS::LAMMPS::installed_packages[] =  {\n")
+set(temp "#ifndef LMP_INSTALLED_PKGS_H\n#define LMP_INSTALLED_PKGS_H\n")
+set(temp "${temp}const char * LAMMPS_NS::LAMMPS::installed_packages[] =  {\n")
 foreach(PKG ${DEFAULT_PACKAGES} ${ACCEL_PACKAGES} ${OTHER_PACKAGES})
     if(PKG_${PKG})
         set(temp "${temp}  \"${PKG}\",\n")
     endif()
 endforeach()
-set(temp "${temp}  NULL\n};\n\n")
+set(temp "${temp}  NULL\n};\n#endif\n\n")
 message(STATUS "Generating lmpinstalledpkgs.h...")
 file(WRITE "${LAMMPS_STYLE_HEADERS_DIR}/lmpinstalledpkgs.h.tmp" "${temp}" )
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LAMMPS_STYLE_HEADERS_DIR}/lmpinstalledpkgs.h.tmp" "${LAMMPS_STYLE_HEADERS_DIR}/lmpinstalledpkgs.h")
diff --git a/src/Makefile b/src/Makefile
index 31d3aebf54..bd658e562c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -153,8 +153,8 @@ help:
 
 lmpinstalledpkgs.h: $(SRC) $(INC)
 	@echo 'Gathering installed package information (may take a little while)'
-	@echo '#ifndef LMP_INSTALLED_PKGS' >  lmpinstalledpkgs.tmp
-	@echo '#define LMP_INSTALLED_PKGS' >> lmpinstalledpkgs.tmp
+	@echo '#ifndef LMP_INSTALLED_PKGS_H' >  lmpinstalledpkgs.tmp
+	@echo '#define LMP_INSTALLED_PKGS_H' >> lmpinstalledpkgs.tmp
 	@echo 'const char * LAMMPS_NS::LAMMPS::installed_packages[] = {' >> lmpinstalledpkgs.tmp
 	@for p in $(PACKAGEUC) $(PACKUSERUC); do info=$$($(SHELL) Package.sh $$p installed); \
              [ -n "$$info" ] && echo "\"$$info\"" | sed -e 's/".*package \(.*\)"/"\1",/' >> lmpinstalledpkgs.tmp || :; done
diff --git a/src/lammps.cpp b/src/lammps.cpp
index 5a572f6b7c..df6519f9f4 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -990,6 +990,7 @@ void LAMMPS::print_config(FILE *fp)
   if (Info::has_png_support()) fputs("-DLAMMPS_PNG\n",fp);
   if (Info::has_jpeg_support()) fputs("-DLAMMPS_JPEG\n",fp);
   if (Info::has_ffmpeg_support()) fputs("-DLAMMPS_FFMPEG\n",fp);
+  if (Info::has_exceptions()) fputs("-DLAMMPS_EXCEPTIONS\n",fp);
 
   fputs("\nInstalled packages:\n\n",fp);
   for (int i = 0; NULL != (pkg = installed_packages[i]); ++i) {