diff --git a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java
index ec0db5f9..40d3fff6 100644
--- a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java
+++ b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java
@@ -20,7 +20,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.annotation.Nullable;
 import javax.inject.Named;
 import javax.inject.Provider;
 import javax.inject.Singleton;
@@ -35,6 +34,8 @@
 import org.mybatis.guice.configuration.settings.ConfigurationSetting;
 import org.mybatis.guice.configuration.settings.MapperConfigurationSetting;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 /**
  * Provides the myBatis Configuration.
  */
@@ -101,8 +102,8 @@ public class ConfigurationProvider implements Provider<Configuration>, Configura
   @com.google.inject.Inject
   private DataSource dataSource;
 
-  private Set<ConfigurationSetting> configurationSettings = new HashSet<ConfigurationSetting>();
-  private Set<MapperConfigurationSetting> mapperConfigurationSettings = new HashSet<MapperConfigurationSetting>();
+  private Set<ConfigurationSetting> configurationSettings = new HashSet<>();
+  private Set<MapperConfigurationSetting> mapperConfigurationSettings = new HashSet<>();
 
   /**
    * @since 1.0.1
diff --git a/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java b/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java
index 8e7fbd30..cdfed9b5 100644
--- a/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java
+++ b/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java
@@ -101,10 +101,7 @@ public TransactionToken begin(TransactionManager man)
 
       try {
         man.begin();
-      } catch (SystemException e) {
-        man.resume(tranToken.getSuspendedTransaction());
-        throw e;
-      } catch (NotSupportedException e) {
+      } catch (NotSupportedException | SystemException e) {
         man.resume(tranToken.getSuspendedTransaction());
         throw e;
       }