diff --git a/src/comm_types/comm_serial.h b/src/comm_types/comm_serial.h
index 067a91a..386b3cd 100644
--- a/src/comm_types/comm_serial.h
+++ b/src/comm_types/comm_serial.h
@@ -39,6 +39,12 @@
 #ifdef MODULES_OPTION_CHECK
       if( (strcmp(argv[i+1], "SERIAL") == 0) )
         comm_type = COMM_SERIAL;
+      #if !defined(EXAMINIMD_ENABLE_MPI) && !defined(EXAMINIMD_ENABLE_KOKKOS_REMOTE_SPACES) 
+      if( (strcmp(argv[i+1], "SERIAL") != 0) ){
+        printf("ERROR: Unsupported Comm-type selected\n");
+        exit(1);
+      }
+      #endif
 #endif
 #ifdef COMM_MODULES_INSTANTIATION
       else if(input->comm_type == COMM_SERIAL) {
diff --git a/src/input.cpp b/src/input.cpp
index 1de761e..336cad7 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -123,7 +123,6 @@ Input::Input(System* p):system(p),input_data(ItemizedFile()),integrator_type(INT
   force_coeff_lines = Kokkos::View<int*,Kokkos::HostSpace>("Input::force_coeff_lines",0);
   input_file_type = -1;
 
-
 #if defined(EXAMINIMD_ENABLE_MPI) && defined(EXAMINIMD_ENABLE_KOKKOS_REMOTE_SPACES)
   comm_type = COMM_MPI;
 #else
diff --git a/src/modules_comm.h b/src/modules_comm.h
index 32c8cd7..a62de7a 100644
--- a/src/modules_comm.h
+++ b/src/modules_comm.h
@@ -38,8 +38,9 @@
 
 // Include Module header files for comm
 
-#if !defined(EXAMINIMD_ENABLE_MPI) && !defined(EXAMINIMD_ENABLE_KOKKOS_REMOTE_SPACES) 
+#if defined(EXAMINIMD_ENABLE_MPI) || defined(EXAMINIMD_ENABLE_KOKKOS_REMOTE_SPACES) 
 #include <comm_serial.h>
-#else 
 #include <comm_mpi.h>
+#else 
+#include <comm_serial.h>
 #endif