1 files changed, 6 insertions, 6 deletions
diff --git a/mastoapi.c b/mastoapi.c
index d3221c1..a81e86e 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -494,18 +494,18 @@ xs_str *mastoapi_id(const xs_dict *msg)
 xs_dict *mastoapi_account(const xs_dict *actor)
 /* converts an ActivityPub actor to a Mastodon account */
 {
+    const char *id  = xs_dict_get(actor, "id");
+    const char *pub = xs_dict_get(actor, "published");
+
+    if (xs_type(id) != XSTYPE_STRING)
+        return NULL;
+
     const char *prefu = xs_dict_get(actor, "preferredUsername");
 
     const char *display_name = xs_dict_get(actor, "name");
     if (xs_is_null(display_name) || *display_name == '\0')
         display_name = prefu;
 
-    const char *id  = xs_dict_get(actor, "id");
-    const char *pub = xs_dict_get(actor, "published");
-
-    if (xs_is_null(id))
-        return NULL;
-
     xs_dict *acct = xs_dict_new();
     xs *acct_md5  = xs_md5_hex(id, strlen(id));
     acct = xs_dict_append(acct, "id",           acct_md5);