diff --git a/Webservice/server.js b/Webservice/server.js
index af2973c..2b948f2 100644
--- a/Webservice/server.js
+++ b/Webservice/server.js
@@ -75,6 +75,6 @@ function generate_log_message(room, user, type, message) {
 }
 
 function pad(width, string, padding) {
-    if (string === undefined) return pad(width, " ", " ");
+    if (string === undefined || string === null) return pad(width, " ", " ");
     return (width <= string.length) ? string : pad(width, string + padding, padding)
 }