diff --git a/socket.c b/socket.c
index 7b1d6ef..1fffd3b 100644
--- a/socket.c
+++ b/socket.c
@@ -317,6 +317,26 @@ char *generate_socket_name(char *socket_name) {
 
 	char *new_socket;
 	char *tcp_port;
+	int i;
+	char *ptr = socket_name;
+
+	// ltrim spaces
+
+	for(i=0;i<(int)strlen(socket_name);i++) {
+		if (isspace(socket_name[i])) {
+			ptr++;	
+		}
+		else {
+			break;
+		}
+	}
+	
+	socket_name = ptr;
+
+	if (socket_name[0] == 0) {
+		uwsgi_log("invalid/empty uwsgi socket name\n");
+		exit(1);
+	}
 
         tcp_port = strchr(socket_name, ':');
 	if (!tcp_port) return socket_name;
diff --git a/spooler.c b/spooler.c
index 0a2b2b1..363e196 100644
--- a/spooler.c
+++ b/spooler.c
@@ -250,7 +250,7 @@ int uwsgi_request_spooler(struct wsgi_request *wsgi_req) {
 			if (unlink(spool_filename)) {
 				uwsgi_error("unlink()");
 				uwsgi_log("something horrible happened !!! check your spooler ASAP !!!\n");
-				goodbye_cruel_world();
+				exit(1);
 			}
 		}
 		return 0;
diff --git a/utils.c b/utils.c
index 281fb37..ec2430f 100644
--- a/utils.c
+++ b/utils.c
@@ -268,7 +268,7 @@ void uwsgi_as_root() {
 #endif
 
 	if (!getuid()) {
-		if (!uwsgi.master_as_root) {
+		if (!uwsgi.master_as_root && !uwsgi.uidname) {
 			uwsgi_log("uWSGI running as root, you can use --uid/--gid/--chroot options\n");
 		}