diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
index 45d52d41934..2ad3a9a0576 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
@@ -346,7 +346,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 						}
 					});
 				}
-				catch (Exception ex) {
+				catch (Throwable ex) {
 					// swallow exception and continue
 				}
 			}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
index ae9715a45fa..9d74f1d2c62 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
@@ -44,7 +44,8 @@ import org.springframework.web.multipart.support.StandardServletMultipartResolve
  * @author Josh Long
  */
 @Configuration
-@ConditionalOnClass({ Servlet.class, StandardServletMultipartResolver.class })
+@ConditionalOnClass({ Servlet.class, StandardServletMultipartResolver.class,
+		MultipartConfigElement.class })
 @ConditionalOnExpression("${multipart.enabled:true}")
 @EnableConfigurationProperties(MultipartProperties.class)
 public class MultipartAutoConfiguration {