diff --git a/CMakeLists.txt b/CMakeLists.txt
index 958e62b..8fd34d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointe
 
 option(SIMMETRIX "Use simmetrix libraries" OFF)
 set(SIMMETRIX_ROOT "" CACHE STRING "Root directory of simmetrix dev files")
-set(SIM_MPI "mpich3" CACHE STRING "MPI version used by simmetrix")
+set(SIM_MPI "" CACHE STRING "MPI version used by simmetrix")
 option(NETCDF "Use netcdf" OFF)
 option(PARASOLID "enable support for parasolid files" OFF)
 option(SCOREC "Use PUMI/APF" OFF)
diff --git a/cmake/FindSIMMETRIX.cmake b/cmake/FindSIMMETRIX.cmake
index e8fdbef..ba86b7e 100644
--- a/cmake/FindSIMMETRIX.cmake
+++ b/cmake/FindSIMMETRIX.cmake
@@ -21,6 +21,10 @@ list(APPEND SIMMETRIX_INCLUDE_DIR
 
 set(SIM_LIB_HINT ${SIMMETRIX_ROOT}/lib/x64_rhel7_gcc48)
 
+if (SIM_MPI STREQUAL "")
+  message(FATAL_ERROR "No MPI implementation for Simmodeler given. Build will fail.")
+endif()
+
 find_library(SIM_DISCRETE_LIB SimDiscrete ${SIM_LIB_HINT})
 find_library(SIM_MESHING_LIB SimMeshing ${SIM_LIB_HINT})
 find_library(SIM_MESH_TOOLS_LIB SimMeshTools ${SIM_LIB_HINT})
@@ -30,7 +34,7 @@ find_library(SIM_PARASOLID_LIB NAMES SimParasolid310 SimParasolid320 SimParasoli
 endif()
 find_library(SIM_PARTITIONED_MESH_LIB SimPartitionedMesh ${SIM_LIB_HINT})
 find_library(SIM_PARTITIONED_MESH_MPI_LIB SimPartitionedMesh-mpi ${SIM_LIB_HINT})
-find_library(SIM_PARTITINED_WRAPPER_LIB SimPartitionWrapper-${SIM_MPI} ${SIM_LIB_HINT})
+find_library(SIM_PARTITIONED_WRAPPER_LIB SimPartitionWrapper-${SIM_MPI} ${SIM_LIB_HINT})
 find_library(SIM_PS_KRNL_LIB pskernel ${SIM_LIB_HINT}/psKrnl)
   
 get_filename_component(SIM_PS_KRNL_LIB_DIR ${SIM_PS_KRNL_LIB} DIRECTORY)
@@ -41,7 +45,7 @@ list(APPEND SIMMETRIX_LIBRARIES
   "${SIM_MESHING_LIB}"
   "${SIM_MESH_TOOLS_LIB}"
   "${SIM_PARTITIONED_MESH_MPI_LIB}"
-  "${SIM_PARTITINED_WRAPPER_LIB}"
+  "${SIM_PARTITIONED_WRAPPER_LIB}"
   "${SIM_MODEL_LIB}"
   "${SIM_PS_KRNL_LIB}"
 )