diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java
index 66632f93cea..812c4b4cb94 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java
@@ -47,6 +47,9 @@ public class ConsoleProxyAjaxImageHandler implements HttpHandler {
 		} catch (IllegalArgumentException e) {
 			s_logger.warn("Exception, ", e);
 			t.sendResponseHeaders(400, -1);		// bad request
+		} catch(OutOfMemoryError e) {
+			s_logger.error("Unrecoverable OutOfMemory Error, exit and let it be re-launched");
+			System.exit(1);
 		} catch(Throwable e) {
 			s_logger.error("Unexpected exception, ", e);
 			t.sendResponseHeaders(500, -1);		// server error