diff --git a/exec/ircd.js b/exec/ircd.js
index 829d8ed3201f8a6c5380183c6dc0f38f4456f29a..026d3aca8beaf4f889f2112dad8800b09052c48c 100644
--- a/exec/ircd.js
+++ b/exec/ircd.js
@@ -194,7 +194,7 @@ function dec_to_ip(ip) {
 function terminate_everything(terminate_reason) {
 	for(thisClient in Clients) {
 		var Client = Clients[thisClient];
-		if (Client.local)
+		if (Client && Client.local)
 			Client.quit(terminate_reason,false)
 	}
 	exit();
@@ -204,9 +204,11 @@ function searchbynick(nick) {
 	if (!nick)
 		return 0;
 	for(thisClient in Clients) {
-		Client=Clients[thisClient];
-		if ((nick.toUpperCase() == Client.nick.toUpperCase()) &&
-		    Client.conntype && !Client.server)
+		var Client=Clients[thisClient];
+		if (Client 
+			&& nick.toUpperCase() == Client.nick.toUpperCase() 
+			&& Client.conntype 
+			&& !Client.server)
 			return Client; // success!
 	}
 	return 0; // failure