diff --git a/.travis.yml b/.travis.yml
index 15dac1d6..b94c3601 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ notifications:
         on_failure: change
 
 matrix:
+  fast_finish: true
   include: 
     - os: linux
       env: COMPILER=g++-4.9 LUA_VERSION=lua52
@@ -43,7 +44,7 @@ matrix:
           - ninja-build
           - liblua5.2-dev
 
-    # gcc-5
+    # gcc-4.9
     - os: linux
       env: COMPILER=g++-4.9 LUA_VERSION=luajit51
       compiler: gcc
diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp
index 049a4c1f..e76eafc8 100644
--- a/single/sol/sol.hpp
+++ b/single/sol/sol.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2017-07-01 15:02:51.956179 UTC
-// This header was generated with sol v2.18.0 (revision da28527)
+// Generated 2017-07-04 08:40:46.845523 UTC
+// This header was generated with sol v2.18.0 (revision 345a398)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -14576,6 +14576,7 @@ namespace sol {
 		state(lua_CFunction panic = default_at_panic) : unique_base(luaL_newstate(), lua_close),
 			state_view(unique_base::get()) {
 			set_panic(panic);
+			sol::protected_function::set_default_handler(sol::object(lua_state(), in_place, default_error_handler));
 			stack::luajit_exception_handler(unique_base::get());
 		}
 
diff --git a/sol/state.hpp b/sol/state.hpp
index 5d0aa841..6df37854 100644
--- a/sol/state.hpp
+++ b/sol/state.hpp
@@ -66,6 +66,7 @@ namespace sol {
 		state(lua_CFunction panic = default_at_panic) : unique_base(luaL_newstate(), lua_close),
 			state_view(unique_base::get()) {
 			set_panic(panic);
+			sol::protected_function::set_default_handler(sol::object(lua_state(), in_place, default_error_handler));
 			stack::luajit_exception_handler(unique_base::get());
 		}