diff --git a/platform/bootstrap/src/com/intellij/idea/Main.java b/platform/bootstrap/src/com/intellij/idea/Main.java
index 9a0f753104df..bc20847531c2 100644
--- a/platform/bootstrap/src/com/intellij/idea/Main.java
+++ b/platform/bootstrap/src/com/intellij/idea/Main.java
@@ -139,6 +139,7 @@ public class Main {
 
     Collections.addAll(args,
                        System.getProperty("java.home") + "/bin/java",
+                       "-Xmx700m",
                        "-classpath",
                        copyPatchFile.getPath(),
                        "com.intellij.updater.Runner",
diff --git a/updater/src/com/intellij/updater/Patch.java b/updater/src/com/intellij/updater/Patch.java
index ac787afd50b0..71a9a520361c 100644
--- a/updater/src/com/intellij/updater/Patch.java
+++ b/updater/src/com/intellij/updater/Patch.java
@@ -200,7 +200,7 @@ public class Patch {
       shouldRevert = true;
       cancelled = true;
     }
-    catch (Exception e) {
+    catch (Throwable e) {
       shouldRevert = true;
       ui.showError(e);
     }
diff --git a/updater/src/com/intellij/updater/SwingUpdaterUI.java b/updater/src/com/intellij/updater/SwingUpdaterUI.java
index 7d28d444519a..64df6367ea97 100644
--- a/updater/src/com/intellij/updater/SwingUpdaterUI.java
+++ b/updater/src/com/intellij/updater/SwingUpdaterUI.java
@@ -187,6 +187,9 @@ public class SwingUpdaterUI implements UpdaterUI {
         }
         catch (OperationCancelledException ignore) {
         }
+        catch(Throwable e) {
+          showError(e);
+        }
         finally {
           isRunning.set(false);