diff --git a/rasterio/_drivers.pyx b/rasterio/_drivers.pyx
index 54fc196d..5b21475d 100644
--- a/rasterio/_drivers.pyx
+++ b/rasterio/_drivers.pyx
@@ -16,7 +16,8 @@ cdef extern from "cpl_conv.h":
 
 
 cdef extern from "cpl_error.h":
-    void CPLSetErrorHandler (void *handler)
+    void CPLSetErrorHandler(void *handler)
+    void CPLSetCurrentErrorHandlerCatchDebug(int bCatchDebug)
 
 
 cdef extern from "gdal.h":
@@ -159,6 +160,7 @@ cdef class GDALEnv(ConfigEnv):
         GDALAllRegister()
         OGRRegisterAll()
         CPLSetErrorHandler(<void *>errorHandler)
+        CPLSetCurrentErrorHandlerCatchDebug(1)
         if driver_count() == 0:
             raise ValueError("Drivers not registered")
 
diff --git a/scripts/travis_gdal_install.sh b/scripts/travis_gdal_install.sh
index 43374b0b..e836abdd 100644
--- a/scripts/travis_gdal_install.sh
+++ b/scripts/travis_gdal_install.sh
@@ -91,8 +91,8 @@ fi
 
 if [ ! -d $GDALINST/gdal-2.1.0 ]; then
   cd $GDALBUILD
-  wget http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0RC3.tar.gz
-  tar -xzf gdal-2.1.0RC3.tar.gz
+  wget http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0RC4.tar.gz
+  tar -xzf gdal-2.1.0RC4.tar.gz
   cd gdal-2.1.0
   ./configure --prefix=$GDALINST/gdal-2.1.0 $GDALOPTS
   make -s -j 2