diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java
index 50d3e44dcad..b8edd581e44 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java
@@ -250,11 +250,7 @@ public class JobProvider {
         Iterator<MappingMetaData> mappings = indexMetaData.getMappings().valuesIt();
         while (mappings.hasNext()) {
             MappingMetaData mapping = mappings.next();
-            try {
-                numFields += countFields(mapping.sourceAsMap());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
+            numFields += countFields(mapping.sourceAsMap());
         }
         return numFields + additionalFieldCount > fieldCountLimit;
     }
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/support/IndexLifecycleManager.java b/plugin/src/main/java/org/elasticsearch/xpack/security/support/IndexLifecycleManager.java
index 213a02899fe..780ba078a92 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/security/support/IndexLifecycleManager.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/security/support/IndexLifecycleManager.java
@@ -262,7 +262,7 @@ public class IndexLifecycleManager extends AbstractComponent {
                 throw new IllegalStateException("Cannot read security-version string in index " + indexName);
             }
             return Version.fromString((String) meta.get(SECURITY_VERSION_STRING));
-        } catch (IOException e) {
+        } catch (ElasticsearchParseException e) {
             logger.error(new ParameterizedMessage(
                     "Cannot parse the mapping for index [{}]", indexName), e);
             throw new ElasticsearchException(
diff --git a/plugin/src/test/java/org/elasticsearch/license/LicensingTests.java b/plugin/src/test/java/org/elasticsearch/license/LicensingTests.java
index 65ce2777957..1aee88fce0a 100644
--- a/plugin/src/test/java/org/elasticsearch/license/LicensingTests.java
+++ b/plugin/src/test/java/org/elasticsearch/license/LicensingTests.java
@@ -6,6 +6,7 @@
 package org.elasticsearch.license;
 
 import org.apache.http.message.BasicHeader;
+import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ElasticsearchSecurityException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.DocWriteResponse;
@@ -56,7 +57,6 @@ import org.elasticsearch.xpack.security.client.SecurityClient;
 import org.elasticsearch.xpack.template.TemplateUtils;
 import org.junit.Before;
 
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -304,7 +304,7 @@ public class LicensingTests extends SecurityIntegTestCase {
             try {
                 Map<String, Object> meta = (Map<String, Object>) metaData.sourceAsMap().get("_meta");
                 return meta != null && expectedVersionAfterMigration.equals(meta.get(securityVersionField));
-            } catch (IOException e) {
+            } catch (ElasticsearchParseException e) {
                 return false;
             }
         }, 3, TimeUnit.SECONDS);
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java
index 246b104ff27..5b68d32b97f 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java
@@ -6,6 +6,7 @@
 package org.elasticsearch.xpack.watcher.history;
 
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
+import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
@@ -70,7 +71,7 @@ public class HistoryTemplateTimeMappingsTests extends AbstractWatcherIntegration
                     assertThat(extractValue("properties.trigger_event.properties.schedule.properties.scheduled_time.type", source),
                             is((Object) "date"));
                     assertThat(extractValue("properties.result.properties.execution_time.type", source), is((Object) "date"));
-                } catch (IOException e) {
+                } catch (ElasticsearchParseException e) {
                     throw new RuntimeException(e);
                 }
             }