diff --git a/main.js b/main.js
index 17a6e79..d33927c 100644
--- a/main.js
+++ b/main.js
@@ -491,7 +491,7 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
         if (client.getUserId() == event.getSender()) {
             return; // skip own messages to prevent loop
         }
-        if (event.getContent() == null || typeof event.getContent().body == "undefined") {
+        if (event.getContent() == null || typeof event.getContent().body == "undefined" || event.getContent().body == null) {
             // Apparently this can happen?
             return;
         }
@@ -499,6 +499,9 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
         if (event.getContent().body.toLowerCase().startsWith("!sms")) {
             // capture command to start room for new number
             const matches = event.getContent().body.match(/([1-9]?[0-9]{10})/g);
+            if (matches == null) {
+                return;
+            }
             if (matches.length == 1 || matches.length == 2) {
                 var tel = matches[0];
                 var ournumber = settings.smsfrom;