diff --git a/buildconf/lua.ini b/buildconf/lua.ini
index 11e19f1f..4451e997 100644
--- a/buildconf/lua.ini
+++ b/buildconf/lua.ini
@@ -1,29 +1,3 @@
 [uwsgi]
-xml = true
-ini = true
-snmp = true
-sctp = false
-erlang = false
-spooler = false
-embedded = false
-udp = true
-multicast = false
-threading = true
-sendfile = true
-nagios = true
-proxy = true
-minterpreters = true
-async = true
-ugreen = false
-http = true
-evdis = false
-ldap = false
-routing = false
-stackless = false
-debug = false
-unbit = false
-xml_implementation = libxml2
-plugins =
-bin_name = uwsgi
-plugin_dir = .
+inherit = default
 embedded_plugins = lua
diff --git a/buildconf/luap.ini b/buildconf/luap.ini
index d1f16973..13826998 100644
--- a/buildconf/luap.ini
+++ b/buildconf/luap.ini
@@ -1,29 +1,4 @@
 [uwsgi]
-xml = true
-ini = true
-snmp = true
-sctp = false
-erlang = false
-spooler = false
-embedded = false
-udp = true
-multicast = false
-threading = true
-sendfile = true
-nagios = true
-proxy = true
-minterpreters = true
-async = true
-ugreen = false
-http = true
-evdis = false
-ldap = false
-routing = false
-stackless = false
-debug = false
-unbit = false
-xml_implementation = libxml2
+inherit = default
 plugins = lua
-bin_name = uwsgi
-plugin_dir = .
-embedded_plugins =
+embedded_plugins = ping, nagios, rpc
diff --git a/plugins/python/pyutils.c b/plugins/python/pyutils.c
index 2e91497f..c335f071 100644
--- a/plugins/python/pyutils.c
+++ b/plugins/python/pyutils.c
@@ -16,6 +16,9 @@ PyObject *python_call(PyObject *callable, PyObject *args, int catch) {
 	pyret =  PyEval_CallObject(callable, args);
 
 	if (PyErr_Occurred()) {
+		if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
+			uwsgi_log("Memory Error detected !!!\n");
+		}
 		if (!catch) {
 			PyErr_Print();
 		}
diff --git a/plugins/python/wsgi_subhandler.c b/plugins/python/wsgi_subhandler.c
index c9c6137b..6f027b98 100644
--- a/plugins/python/wsgi_subhandler.c
+++ b/plugins/python/wsgi_subhandler.c
@@ -165,7 +165,12 @@ int uwsgi_response_subhandler_wsgi(struct wsgi_request *wsgi_req) {
 	pychunk = PyIter_Next(wsgi_req->async_placeholder);
 
 	if (!pychunk) {
-		if (PyErr_Occurred()) PyErr_Print();
+		if (PyErr_Occurred()) { 
+		        if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
+				uwsgi_log("Memory Error detected !!!\n");	
+			}		
+			PyErr_Print();
+		}	
 		goto clear;
 	}