X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/d49d536c32f5d44eaf50f3ac20dfd8e72e94c985..320e126eebc4e3ebac5144197e640508704eeb0c:/src/main/java/org/asamk/signal/manager/Utils.java

diff --git a/src/main/java/org/asamk/signal/manager/Utils.java b/src/main/java/org/asamk/signal/manager/Utils.java
index 0b74f01d..449681d2 100644
--- a/src/main/java/org/asamk/signal/manager/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/Utils.java
@@ -252,6 +252,9 @@ class Utils {
         } else {
             // Version 1: E164 user
             version = 1;
+            if (!ownAddress.getNumber().isPresent() || !theirAddress.getNumber().isPresent()) {
+                return "INVALID ID";
+            }
             ownId = ownAddress.getNumber().get().getBytes();
             theirId = theirAddress.getNumber().get().getBytes();
         }