diff --git a/core/master_checks.c b/core/master_checks.c
index 7da0e532..2ffa60b4 100644
--- a/core/master_checks.c
+++ b/core/master_checks.c
@@ -341,6 +341,7 @@ int uwsgi_master_check_daemons_death(int diedpid) {
 
 int uwsgi_worker_is_busy(int wid) {
 	int i;
+	if (uwsgi.workers[uwsgi.mywid].sig) return 1;
 	for(i=0;i<uwsgi.cores;i++) {
 		if (uwsgi.workers[wid].cores[i].in_request) {
 			return 1;
diff --git a/plugins/psgi/psgi_plugin.c b/plugins/psgi/psgi_plugin.c
index 93960531..fda5ec39 100644
--- a/plugins/psgi/psgi_plugin.c
+++ b/plugins/psgi/psgi_plugin.c
@@ -862,6 +862,11 @@ static void uwsgi_perl_atexit() {
         if (uwsgi.workers[uwsgi.mywid].hijacked)
                 goto destroyperl;
 
+	// if busy do not run atexit hooks (as this part could be called in a signal handler
+	// while a subroutine is running)
+        if (uwsgi_worker_is_busy(uwsgi.mywid))
+                return;
+
 realstuff:
 
 	if (uperl.atexit) {