diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java
index cc7cd98..7a8a9b0 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java
@@ -49,7 +49,6 @@ import javax.interceptor.InvocationContext;
 import org.slf4j.Logger;
 
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.exception.ExceptionHandler;
 import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
 import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
@@ -186,11 +185,10 @@ public class ExceptionHandlerInterceptor implements Serializable {
 
 	@AroundInvoke
 	public Object manage(final InvocationContext ic) throws Exception {
-		Object target = null;
 		Object result = null;
+		Object target = ic.getTarget();
 
 		try {
-			target = ic.getTarget();
 			result = ic.proceed();
 
 		} catch (Exception cause) {
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java
index 705fdc7..d5fb5dc 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java
@@ -131,7 +131,7 @@ public abstract class AbstractLifecycleBootstrap<A extends Annotation> implement
 		getLogger().debug(getBundle().getString("executing-all", getAnnotationClass().getSimpleName()));
 
 		Collections.sort(processors);
-		Throwable failure = null;
+		Exception failure = null;
 
 		if (!registered) {
 			for (CustomContext tempContext : tempContexts) {
@@ -153,7 +153,7 @@ public abstract class AbstractLifecycleBootstrap<A extends Annotation> implement
 					iter.remove();
 				}
 
-			} catch (Throwable cause) {
+			} catch (Exception cause) {
 				failure = cause;
 			}
 		}
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java
index 5f99e08..58869ca 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java
@@ -85,7 +85,7 @@ public class AnnotatedMethodProcessor<T> implements Comparable<AnnotatedMethodPr
 		return orderThis.compareTo(orderOther);
 	}
 
-	public boolean process(Object... args) throws Throwable {
+	public boolean process(Object... args) throws Exception {
 		getLogger().info(getBundle().getString("processing", getAnnotatedMethod().getJavaMember().toGenericString()));
 
 		try {
@@ -98,11 +98,11 @@ public class AnnotatedMethodProcessor<T> implements Comparable<AnnotatedMethodPr
 		return true;
 	}
 
-	private void handleException(Throwable cause) throws Throwable {
+	private void handleException(Throwable cause) throws Exception {
 		ApplicationException ann = cause.getClass().getAnnotation(ApplicationException.class);
 
 		if (ann == null || SeverityType.FATAL == ann.severity()) {
-			throw cause;
+			throw (cause instanceof Exception ? (Exception) cause : new Exception(cause));
 
 		} else {
 			switch (ann.severity()) {
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java
index 22ac463..23e0422 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java
@@ -49,9 +49,6 @@ import org.slf4j.Logger;
 
 import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
-import br.gov.frameworkdemoiselle.security.AuthorizationException;
-import br.gov.frameworkdemoiselle.security.RequiredRole;
-import br.gov.frameworkdemoiselle.security.SecurityContext;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 
@@ -90,7 +87,8 @@ public class RequiredRoleInterceptor implements Serializable {
 
 		if (getSecurityContext().isLoggedIn()) {
 			getLogger().info(
-					getBundle().getString("has-role-verification", getSecurityContext().getCurrentUser().getName(), roles));
+					getBundle().getString("has-role-verification", getSecurityContext().getCurrentUser().getName(),
+							roles));
 		}
 
 		List<String> userRoles = new ArrayList<String>();
@@ -102,15 +100,16 @@ public class RequiredRoleInterceptor implements Serializable {
 		}
 
 		if (userRoles.isEmpty()) {
-			getLogger().error(
-					getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(), roles));
+			getLogger()
+					.error(getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(),
+							roles));
 
-			@SuppressWarnings("unused")
-			AuthorizationException a = new AuthorizationException(null);
+			// AuthorizationException a = new AuthorizationException(null);
 			throw new AuthorizationException(getBundle().getString("does-not-have-role-ui", roles));
 		}
 
-		getLogger().debug(getBundle().getString("user-has-role", getSecurityContext().getCurrentUser().getName(), userRoles));
+		getLogger().debug(
+				getBundle().getString("user-has-role", getSecurityContext().getCurrentUser().getName(), userRoles));
 
 		return ic.proceed();
 	}
diff --git a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java
index 72878d9..2a5a059 100644
--- a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java
+++ b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java
@@ -48,8 +48,8 @@ public class DataSourceProducer implements Serializable {
 
 			try {
 				create(dataBaseName);
-			} catch (Throwable t) {
-				throw new DemoiselleException(t);
+			} catch (Exception cause) {
+				throw new DemoiselleException(cause);
 			}
 
 			logger.debug(bundle.getString("datasource-name-found", dataBaseName));
diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java
index a036695..7775fcb 100644
--- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java
+++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java
@@ -113,8 +113,8 @@ public class EntityManagerFactoryProducer implements Serializable {
 
 			try {
 				create(persistenceUnit);
-			} catch (Throwable t) {
-				throw new DemoiselleException(t);
+			} catch (Exception cause) {
+				throw new DemoiselleException(cause);
 			}
 
 			logger.debug(bundle.getString("persistence-unit-name-found", persistenceUnit));
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java
index cdfdb4f..1ef9e77 100644
--- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java
+++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java
@@ -42,6 +42,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
@@ -81,10 +82,10 @@ public class Redirector implements Serializable {
 			ArrayList<String> list;
 			result = new HashMap<String, List<String>>();
 
-			for (String key : map.keySet()) {
+			for (Entry<String, Object> entry : map.entrySet()) {
 				list = new ArrayList<String>();
-				list.add(map.get(key).toString());
-				result.put(key, list);
+				list.add(entry.getValue().toString());
+				result.put(entry.getKey(), list);
 			}
 		}
 
--
libgit2 0.21.2