diff --git a/lib/modules/Protocols.pmod/SMTP.pmod b/lib/modules/Protocols.pmod/SMTP.pmod
index b1d89bdafec7c04eaebbef88775e6aeca15bc98e..91f5129e551947c184a60acc30d70cdb6eb20b77 100644
--- a/lib/modules/Protocols.pmod/SMTP.pmod
+++ b/lib/modules/Protocols.pmod/SMTP.pmod
@@ -62,7 +62,7 @@ class client
     if(!port)
       port = 25;
 
-    if(!connect(server, port))
+    if(!server || !connect(server, port))
     {
       throw(({"Failed to connect to mail server.\n",backtrace()}));
     }