diff --git a/spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java b/spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java
index 6274a49c94..d8db8764a9 100644
--- a/spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java
+++ b/spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java
@@ -77,14 +77,21 @@ public class SpringPackageScanClassResolver extends DefaultPackageScanClassResol
 			MetadataReader reader = readerFactory.getMetadataReader(resource);
 			return ClassUtils.forName(reader.getClassMetadata().getClassName(), loader);
 		}
-		catch (NoClassDefFoundError ex) {
+		catch (ClassNotFoundException ex) {
 			handleFailure(resource, ex);
 			return null;
 		}
-		catch (Exception ex) {
+		catch (LinkageError ex) {
 			handleFailure(resource, ex);
 			return null;
 		}
+		catch (Throwable ex) {
+			if (this.logger.isWarnEnabled()) {
+				this.logger.warn("Unexpected failure when loading class resource "
+						+ resource, ex);
+			}
+			return null;
+		}
 	}
 
 	private void handleFailure(Resource resource, Throwable ex) {