diff --git a/source/java/org/alfresco/web/bean/CategoriesBean.java b/source/java/org/alfresco/web/bean/CategoriesBean.java
index 31ddaade30..3f57dab084 100644
--- a/source/java/org/alfresco/web/bean/CategoriesBean.java
+++ b/source/java/org/alfresco/web/bean/CategoriesBean.java
@@ -351,7 +351,7 @@ public class CategoriesBean implements IContextListener
          categories = Collections.<Node>emptyList();
          try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
       }
-      catch (Exception err)
+      catch (Throwable err)
       {
          Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
                FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
diff --git a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
index 5b0c51151e..25a92345f1 100644
--- a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
+++ b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
@@ -772,7 +772,7 @@ public class DocumentDetailsBean
                   approveFolder.getId());
          }
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
@@ -877,7 +877,7 @@ public class DocumentDetailsBean
                   rejectFolder.getId());
          }
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
@@ -907,7 +907,7 @@ public class DocumentDetailsBean
          // reset the state of the current document
          getDocument().reset();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
@@ -937,7 +937,7 @@ public class DocumentDetailsBean
          // reset the state of the current document
          getDocument().reset();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
@@ -985,7 +985,7 @@ public class DocumentDetailsBean
          // reset the state of the current document
          getDocument().reset();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
@@ -1100,7 +1100,7 @@ public class DocumentDetailsBean
          // commit the transaction
          tx.commit();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
index a51e945004..0b9a6571a9 100644
--- a/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
+++ b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
@@ -261,7 +261,7 @@ public class DocumentPropertiesBean
          // this failure means the node no longer exists - we cannot show the doc properties screen
          outcome = "browse";
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/ExportBean.java b/source/java/org/alfresco/web/bean/ExportBean.java
index d41b71a318..14548f025d 100644
--- a/source/java/org/alfresco/web/bean/ExportBean.java
+++ b/source/java/org/alfresco/web/bean/ExportBean.java
@@ -121,7 +121,7 @@ public class ExportBean
          // reset the bean
          reset();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/ImportBean.java b/source/java/org/alfresco/web/bean/ImportBean.java
index fd8252a9a9..bfd6bfd31c 100644
--- a/source/java/org/alfresco/web/bean/ImportBean.java
+++ b/source/java/org/alfresco/web/bean/ImportBean.java
@@ -120,7 +120,7 @@ public class ImportBean
                // reset the bean
                reset();
             }
-            catch (Exception e)
+            catch (Throwable e)
             {
                // rollback the transaction
                try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/UserShortcutsBean.java b/source/java/org/alfresco/web/bean/UserShortcutsBean.java
index 7eb3943224..52252339f2 100644
--- a/source/java/org/alfresco/web/bean/UserShortcutsBean.java
+++ b/source/java/org/alfresco/web/bean/UserShortcutsBean.java
@@ -153,7 +153,7 @@ public class UserShortcutsBean
                tx.rollback();
             }
          }
-         catch (Exception err)
+         catch (Throwable err)
          {
             Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
                   FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
@@ -251,7 +251,7 @@ public class UserShortcutsBean
                   if (logger.isDebugEnabled())
                      logger.debug("Added node: " + node.getName() + " to the user shortcuts list.");
                }
-               catch (Exception err)
+               catch (Throwable err)
                {
                   Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
                         FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
@@ -308,7 +308,7 @@ public class UserShortcutsBean
                logger.debug("Removed node: " + node.getName() + " from the user shortcuts list.");
          }
       }
-      catch (Exception err)
+      catch (Throwable err)
       {
          Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
                FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
@@ -373,7 +373,7 @@ public class UserShortcutsBean
                   logger.debug("Removed deleted node: " + node.getName() + " from the user shortcuts list.");
             }
          }
-         catch (Exception err)
+         catch (Throwable err)
          {
             try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
          }
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
index e507fdfc4c..ffdb2aded1 100644
--- a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
@@ -221,7 +221,7 @@ public class ClipboardBean
          // refresh UI on success
          UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
       }
-      catch (Exception err)
+      catch (Throwable err)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java
index be89f7b02e..cd9e4b66f3 100644
--- a/source/java/org/alfresco/web/bean/repository/Repository.java
+++ b/source/java/org/alfresco/web/bean/repository/Repository.java
@@ -539,7 +539,7 @@ public final class Repository
          personNodes = Collections.<Node>emptyList();
          try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
       }
-      catch (Exception err)
+      catch (Throwable err)
       {
          Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
                context, Repository.ERROR_GENERIC), err.getMessage()), err );
diff --git a/source/java/org/alfresco/web/bean/users/UserMembersBean.java b/source/java/org/alfresco/web/bean/users/UserMembersBean.java
index 7a9e304c8b..884918f0ff 100644
--- a/source/java/org/alfresco/web/bean/users/UserMembersBean.java
+++ b/source/java/org/alfresco/web/bean/users/UserMembersBean.java
@@ -356,7 +356,7 @@ public abstract class UserMembersBean
          personNodes = Collections.<Map>emptyList();
          try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
       }
-      catch (Exception err)
+      catch (Throwable err)
       {
          Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
                context, Repository.ERROR_GENERIC), err.getMessage()), err );
diff --git a/source/java/org/alfresco/web/bean/users/UsersBean.java b/source/java/org/alfresco/web/bean/users/UsersBean.java
index e361d37aa9..35716f1fdb 100644
--- a/source/java/org/alfresco/web/bean/users/UsersBean.java
+++ b/source/java/org/alfresco/web/bean/users/UsersBean.java
@@ -273,7 +273,7 @@ public class UsersBean implements IContextListener
          // commit the transaction
          tx.commit();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
diff --git a/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
index 48a0570182..cca568a1c7 100644
--- a/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
@@ -243,7 +243,7 @@ public abstract class BaseContentWizard extends AbstractWizardBean
          // no outcome
          outcome = null;
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
index ef9b296d12..32dce661df 100644
--- a/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
@@ -254,7 +254,7 @@ public abstract class InviteUsersWizard extends AbstractWizardBean
          
          UIContextService.getInstance(context).notifyBeans();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
@@ -407,7 +407,7 @@ public abstract class InviteUsersWizard extends AbstractWizardBean
          // commit the transaction
          tx.commit();
       }
-      catch (Exception err)
+      catch (Throwable err)
       {
          Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
                FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err );
diff --git a/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java b/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java
index 7cc15ad259..c3f7786313 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java
@@ -88,7 +88,7 @@ public class NewActionWizard extends BaseActionWizard
          // commit the transaction
          tx.commit();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java b/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java
index cbf96fefd3..71a59fbf4f 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java
@@ -112,7 +112,7 @@ public class NewDiscussionWizard extends NewTopicWizard
          // commit the transaction
          tx.commit();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
@@ -159,7 +159,7 @@ public class NewDiscussionWizard extends NewTopicWizard
          // commit the transaction
          tx.commit();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
index efb25bb039..126c548a0f 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
@@ -215,7 +215,7 @@ public class NewRuleWizard extends BaseActionWizard
          // commit the transaction
          tx.commit();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
index 02bf38c021..6c96c51939 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
@@ -284,7 +284,7 @@ public class NewSpaceWizard extends AbstractWizardBean
          // no outcome
          outcome = null;
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
index 7f5043b5d4..3cdaafc0cb 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
@@ -537,7 +537,7 @@ public class NewUserWizard extends AbstractWizardBean
          // reset the richlist component so it rebinds to the users list
          invalidateUserList();
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java
index e6071c7cd3..f7024a32d0 100644
--- a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java
+++ b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java
@@ -399,7 +399,7 @@ public class UIRichList extends UIComponentBase implements IDataContainer
             tx.commit();
          }
       }
-      catch (Exception err)
+      catch (Throwable err)
       {
          try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
       }