diff --git a/.travis b/.travis
index bad6dbd29cf70e852e5e427e876390d954ca7d6b..0f12f18e62a504278ef31f0118f1da48607a524e 160000
--- a/.travis
+++ b/.travis
@@ -1 +1 @@
-Subproject commit bad6dbd29cf70e852e5e427e876390d954ca7d6b
+Subproject commit 0f12f18e62a504278ef31f0118f1da48607a524e
diff --git a/.travis.yml b/.travis.yml
index c8beb76b84af3df632e124d86f2380b1e02a85bd..09c33e77f10f9a39dcce90a7bc492043ad9bb75e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ env:
     - DO_COVERAGE_ON_BRANCH="master;release"
     - DO_CPPCHECK_ON_BRANCH=""
     - DO_INSTALL_DOC_EXCEPT_ON_BRANCH=""
+    - BUILD_WITH_CATKIN_SUPPORT=false
 
 jobs:
   include:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc4ab1504399a61fb25b1743789ed5c065a5bd7b..072e68732ef19c465a69fa4d28e613bd2f4c2d6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,11 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+# Check if the submodule cmake have been initialized
+IF(NOT EXISTS "${PROJECT_SOURCE_DIR}/cmake/base.cmake")
+  MESSAGE(FATAL_ERROR "\nPlease run the following command first:\ngit submodule update --init\n")
+ENDIF()
+
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/python.cmake)