diff -rup gdal-2.1.0-orig/swig/include/ogr.i gdal-2.1.0/swig/include/ogr.i
--- gdal-2.1.0-orig/swig/include/ogr.i	2016-04-25 20:35:57.000000000 +0300
+++ gdal-2.1.0/swig/include/ogr.i	2016-05-10 17:37:30.288087450 +0300
@@ -2020,8 +2020,7 @@ public:
   int GetGeomFieldIndex(int i) {
       if (i < 0 || i >= OGR_FD_GetGeomFieldCount(self))
           CPLError(CE_Failure, 1, FIELD_INDEX_ERROR_TMPL, i);
-      else
-          return i;
+      return i;
   }
 #endif